From 73c9a31b86d294350ce83e3b55dcc2a0144ba2dc Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Fri, 31 Jul 2020 03:40:27 +1000
Subject: [PATCH] Android: Expose more settings via UI

---
 android/app/src/main/res/values/arrays.xml    | 26 +++++++++++
 .../app/src/main/res/xml/root_preferences.xml | 46 ++++++++++++++-----
 2 files changed, 61 insertions(+), 11 deletions(-)

diff --git a/android/app/src/main/res/values/arrays.xml b/android/app/src/main/res/values/arrays.xml
index 192148cf6..8adfaf076 100644
--- a/android/app/src/main/res/values/arrays.xml
+++ b/android/app/src/main/res/values/arrays.xml
@@ -67,6 +67,32 @@
         <item>15</item>
         <item>16</item>
     </string-array>
+    <string-array name="settings_display_crop_mode_entries">
+        <item>None</item>
+        <item>Overscan</item>
+        <item>Borders</item>
+    </string-array>
+    <string-array name="settings_display_crop_mode_values">
+        <item>None</item>
+        <item>Only Overscan Area</item>
+        <item>All Borders</item>
+    </string-array>
+      <string-array name="settings_display_aspect_ratio_names">
+        <item>4:3</item>
+        <item>16:9</item>
+        <item>8:7</item>
+        <item>2:1 (VRAM 1:1)</item>
+        <item>1:1</item>
+        <item>PAR 1:1</item>
+    </string-array>
+    <string-array name="settings_display_aspect_ratio_values">
+        <item>4:3</item>
+        <item>16:9</item>
+        <item>8:7</item>
+        <item>2:1 (VRAM 1:1)</item>
+        <item>1:1</item>
+        <item>PAR 1:1</item>
+    </string-array>
     <string-array name="settings_controller_type_entries">
         <item>Digital Controller (Gamepad)</item>
         <item>Analog Controller (DualShock)</item>
diff --git a/android/app/src/main/res/xml/root_preferences.xml b/android/app/src/main/res/xml/root_preferences.xml
index 07f03f492..c4a10f0a5 100644
--- a/android/app/src/main/res/xml/root_preferences.xml
+++ b/android/app/src/main/res/xml/root_preferences.xml
@@ -57,24 +57,19 @@
 
     <PreferenceCategory app:title="@string/settings_behavior_header">
         <SwitchPreferenceCompat
-            app:key="General/SpeedLimiterEnabled"
+            app:key="Main/SpeedLimiterEnabled"
             app:title="@string/settings_behavior_enable_speed_limiter"
             app:defaultValue="true"
             app:useSimpleSummaryProvider="true" />
         <SwitchPreferenceCompat
-            app:key="General/StartPaused"
+            app:key="Main/StartPaused"
             app:title="@string/settings_behavior_pause_on_start"
             app:useSimpleSummaryProvider="true" />
         <SwitchPreferenceCompat
-            app:key="General/SyncToAudio"
+            app:key="Audio/Sync"
             app:title="@string/settings_host_synchronization_sync_to_audio"
             app:defaultValue="true"
             app:useSimpleSummaryProvider="true" />
-        <SwitchPreferenceCompat
-            app:key="General/SyncToVideo"
-            app:title="@string/settings_host_synchronization_sync_to_video"
-            app:defaultValue="true"
-            app:useSimpleSummaryProvider="true" />
     </PreferenceCategory>
 
     <PreferenceCategory app:title="@string/settings_osd_header">
@@ -132,11 +127,40 @@
             app:title="@string/settings_gpu_true_color"
             app:defaultValue="false"/>
 
-        <SwitchPreferenceCompat
+    </PreferenceCategory>
+  
+    <PreferenceCategory app:title="Display">
+         <ListPreference
+            app:key="Display/CropMode"
+            app:title="Crop Mode"
+            app:entries="@array/settings_display_crop_mode_entries"
+            app:entryValues="@array/settings_display_crop_mode_values"
+            app:defaultValue="Overscan"
+            app:useSimpleSummaryProvider="true" />
+      
+         <ListPreference
+            app:key="Display/AspectRatio"
+            app:title="Aspect Ratio"
+            app:entries="@array/settings_display_aspect_ratio_names"
+            app:entryValues="@array/settings_display_aspect_ratio_values"
+            app:defaultValue="4:3"
+            app:useSimpleSummaryProvider="true" />]
+            
+         <SwitchPreferenceCompat
             app:key="Display/LinearFiltering"
-            app:title="@string/settings_gpu_display_linear_filtering"
+            app:title="Linear Upscaling"
             app:defaultValue="true"/>
-
+      
+         <SwitchPreferenceCompat
+            app:key="Display/IntegerScaling"
+            app:title="Integer Upscaling"
+            app:defaultValue="false"/>
+      
+         <SwitchPreferenceCompat
+            app:key="Display/VSync"
+            app:title="VSync"
+            app:defaultValue="true"
+            app:useSimpleSummaryProvider="true" />
     </PreferenceCategory>
 
     <PreferenceCategory app:title="Controller">