summaryrefslogtreecommitdiff
path: root/Source/Android
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2016-01-03 09:42:41 -0600
committerRyan Houdek <Sonicadvance1@gmail.com>2016-01-03 09:42:41 -0600
commit6e60dc60e08477230328d2376c280cbf64daaf82 (patch)
tree513f2a6285751240d74f52922a1f8af1b535842c /Source/Android
parenta63873535fd0e63d53d1ca3ad76061dd01929b0e (diff)
[Android] Disable screen lock when a title is running.
Encountered this when testing out the Wii U Gamecube Adapter.
Diffstat (limited to 'Source/Android')
-rw-r--r--Source/Android/app/src/main/res/layout-television/activity_emulation.xml1
-rw-r--r--Source/Android/app/src/main/res/layout/fragment_emulation.xml1
2 files changed, 2 insertions, 0 deletions
diff --git a/Source/Android/app/src/main/res/layout-television/activity_emulation.xml b/Source/Android/app/src/main/res/layout-television/activity_emulation.xml
index 06fe747c39..a8cba9adb5 100644
--- a/Source/Android/app/src/main/res/layout-television/activity_emulation.xml
+++ b/Source/Android/app/src/main/res/layout-television/activity_emulation.xml
@@ -1,6 +1,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:keepScreenOn="true"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/frame_content">
diff --git a/Source/Android/app/src/main/res/layout/fragment_emulation.xml b/Source/Android/app/src/main/res/layout/fragment_emulation.xml
index 451e4bec60..28f51b2412 100644
--- a/Source/Android/app/src/main/res/layout/fragment_emulation.xml
+++ b/Source/Android/app/src/main/res/layout/fragment_emulation.xml
@@ -2,6 +2,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:keepScreenOn="true"
tools:context="org.dolphinemu.dolphinemu.fragments.EmulationFragment">
<!-- This is what everything is rendered to during emulation -->