Merge branch 'master' of github.com:gothfox/Tiny-Comics-Reader

Conflicts:
	res/values/styles.xml

1 files changed, 4 insertions, 1 deletions

diff --git a/src/org/fox/ttcomics/ViewComicActivity.java b/src/org/fox/ttcomics/ViewComicActivity.java
index 0c3630b..deda68c 100644
--- a/src/org/fox/ttcomics/ViewComicActivity.java
+++ b/src/org/fox/ttcomics/ViewComicActivity.java
@@ -45,6 +45,9 @@ public class ViewComicActivity extends CommonActivity {
         	setTheme(m_prefs.getBoolean("use_dark_theme", false) ? R.style.DarkTheme : R.style.AppTheme);

         

         requestWindowFeature(Window.FEATURE_PROGRESS);

+

+        if (m_prefs.getBoolean("prevent_screen_sleep", false))

+        	getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);

         

         setContentView(R.layout.activity_view_comic);

         

@@ -76,7 +79,7 @@ public class ViewComicActivity extends CommonActivity {
         } */

         

         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT && m_prefs.getBoolean("use_dark_theme", false)) {

-        	getSupportActionBar().setBackgroundDrawable(new ColorDrawable(Color.BLACK));

+        	getSupportActionBar().setBackgroundDrawable(new ColorDrawable(Color.BLACK));        	

         }

     }