diff --git a/app/src/main/java/org/xbmc/kore/Settings.java b/app/src/main/java/org/xbmc/kore/Settings.java
index 09ad38f..387ced5 100644
--- a/app/src/main/java/org/xbmc/kore/Settings.java
+++ b/app/src/main/java/org/xbmc/kore/Settings.java
@@ -65,6 +65,10 @@ public class Settings {
public static final String KEY_PREF_KEEP_REMOTE_ABOVE_LOCKSCREEN = "pref_keep_remote_above_lockscreen";
public static final boolean DEFAULT_KEY_PREF_KEEP_REMOTE_ABOVE_LOCKSCREEN = false;
+ // Keep screen on when on the remote activity
+ public static final String KEY_PREF_KEEP_SCREEN_ON = "pref_keep_screen_on";
+ public static final boolean DEFAULT_KEY_PREF_KEEP_SCREEN_ON = false;
+
// Show notifications
public static final String KEY_PREF_SHOW_NOTIFICATION = "pref_show_notification";
public static final boolean DEFAULT_PREF_SHOW_NOTIFICATION = false;
diff --git a/app/src/main/java/org/xbmc/kore/ui/RemoteActivity.java b/app/src/main/java/org/xbmc/kore/ui/RemoteActivity.java
index 2c540d9..8e3dc31 100644
--- a/app/src/main/java/org/xbmc/kore/ui/RemoteActivity.java
+++ b/app/src/main/java/org/xbmc/kore/ui/RemoteActivity.java
@@ -179,6 +179,17 @@ public class RemoteActivity extends BaseActivity
getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
}
+ // Check whether we should keep the screen on
+ boolean keepScreenOn = PreferenceManager
+ .getDefaultSharedPreferences(this)
+ .getBoolean(Settings.KEY_PREF_KEEP_SCREEN_ON,
+ Settings.DEFAULT_KEY_PREF_KEEP_SCREEN_ON);
+ if (keepScreenOn) {
+ getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+ } else {
+ getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+ }
+
checkPVREnabledAndSetMenuItems();
}
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 479c529..9f3eb65 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -34,6 +34,11 @@
android:title="@string/keep_remote_above_lockscreen"
android:defaultValue="false"/>
+
+