diff options
author | Andrew Dolgov <[email protected]> | 2014-10-15 15:49:45 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2014-10-15 15:49:45 +0400 |
commit | 293454dc14153ef5f3a9b30fbffc8c0cd95b9410 (patch) | |
tree | 15aa19db78534a03b2299b3002949d61d537df22 /src | |
parent | a2e8246a4e087e6394eb20860aa10dec77b071ab (diff) | |
parent | 179296966f8d7db0a31e32254ff0effd0a51bbea (diff) |
Merge branch 'master' of github.com:gothfox/Tiny-Comics-Reader
Conflicts:
res/values/styles.xml
Diffstat (limited to 'src')
-rw-r--r-- | src/org/fox/ttcomics/ViewComicActivity.java | 5 |
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));
}
}
|