From 47eede06c8405ef8275e4130855ff4a969ed1bbe Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Sun, 18 Oct 2020 14:47:13 +1000
Subject: [PATCH] Android: Move OSD options to Display category

---
 .../src/main/res/xml/display_preferences.xml  | 25 +++++++++++++++++++
 .../src/main/res/xml/general_preferences.xml  | 25 -------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/android/app/src/main/res/xml/display_preferences.xml b/android/app/src/main/res/xml/display_preferences.xml
index c2ed35d50..f5428bb23 100644
--- a/android/app/src/main/res/xml/display_preferences.xml
+++ b/android/app/src/main/res/xml/display_preferences.xml
@@ -48,5 +48,30 @@
             app:defaultValue="false"
             app:summary="Adds padding to the display area to ensure that the ratio between pixels on the host to pixels in the console is an integer number. May result in a sharper image in some 2D games."
             app:iconSpaceReserved="false" />
+  
+        <SwitchPreferenceCompat
+            app:key="Display/ShowOSDMessages"
+            app:title="@string/settings_osd_show_messages"
+            app:defaultValue="true"
+            app:summary="Shows on-screen-display messages when events occur such as save states being created/loaded, screenshots being taken, etc."
+            app:iconSpaceReserved="false" />
+        <SwitchPreferenceCompat
+            app:key="Display/ShowSpeed"
+            app:title="@string/settings_osd_show_speed"
+            app:defaultValue="false"
+            app:summary="Sets the target emulation speed. It is not guaranteed that this speed will be reached, and if not, the emulator will run as fast as it can manage."
+            app:iconSpaceReserved="false" />
+        <SwitchPreferenceCompat
+            app:key="Display/ShowFPS"
+            app:title="@string/settings_osd_show_show_fps"
+            app:defaultValue="false"
+            app:summary="Shows the internal frame rate of the game in the top-right corner of the display."
+            app:iconSpaceReserved="false" />
+        <SwitchPreferenceCompat
+            app:key="Display/ShowVPS"
+            app:title="@string/settings_osd_show_show_vps"
+            app:defaultValue="false"
+            app:summary="Shows the number of frames (or v-syncs) displayed per second by the system in the top-right corner of the display."
+            app:iconSpaceReserved="false" />
 
 </PreferenceScreen>
diff --git a/android/app/src/main/res/xml/general_preferences.xml b/android/app/src/main/res/xml/general_preferences.xml
index 7abc7e16d..59fcfa0cd 100644
--- a/android/app/src/main/res/xml/general_preferences.xml
+++ b/android/app/src/main/res/xml/general_preferences.xml
@@ -68,29 +68,4 @@
             app:useSimpleSummaryProvider="true"
             app:iconSpaceReserved="false" />
 
-        <SwitchPreferenceCompat
-            app:key="Display/ShowOSDMessages"
-            app:title="@string/settings_osd_show_messages"
-            app:defaultValue="true"
-            app:summary="Shows on-screen-display messages when events occur such as save states being created/loaded, screenshots being taken, etc."
-            app:iconSpaceReserved="false" />
-        <SwitchPreferenceCompat
-            app:key="Display/ShowSpeed"
-            app:title="@string/settings_osd_show_speed"
-            app:defaultValue="false"
-            app:summary="Sets the target emulation speed. It is not guaranteed that this speed will be reached, and if not, the emulator will run as fast as it can manage."
-            app:iconSpaceReserved="false" />
-        <SwitchPreferenceCompat
-            app:key="Display/ShowFPS"
-            app:title="@string/settings_osd_show_show_fps"
-            app:defaultValue="false"
-            app:summary="Shows the internal frame rate of the game in the top-right corner of the display."
-            app:iconSpaceReserved="false" />
-        <SwitchPreferenceCompat
-            app:key="Display/ShowVPS"
-            app:title="@string/settings_osd_show_show_vps"
-            app:defaultValue="false"
-            app:summary="Shows the number of frames (or v-syncs) displayed per second by the system in the top-right corner of the display."
-            app:iconSpaceReserved="false" />
-
 </PreferenceScreen>