From 0050c52e63d0d48803517c55e22dd2f23b49d466 Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Thu, 8 Oct 2020 18:32:54 +1000
Subject: [PATCH] Android: Add some missing settings

---
 android/app/src/main/res/values/arrays.xml    | 24 ++++++++++++++
 .../app/src/main/res/xml/root_preferences.xml | 31 +++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/android/app/src/main/res/values/arrays.xml b/android/app/src/main/res/values/arrays.xml
index 13e3b9376..bf03f2cfc 100644
--- a/android/app/src/main/res/values/arrays.xml
+++ b/android/app/src/main/res/values/arrays.xml
@@ -140,4 +140,28 @@
         <item>Settings</item>
         <item>Quit</item>
     </string-array>
+    <string-array name="settings_cdrom_read_speedup_entries">
+        <item>None (Double Speed)</item>
+        <item>2x (Quad Speed)</item>
+        <item>3x (6x Speed)</item>
+        <item>4x (8x Speed)</item>
+        <item>5x (10x Speed)</item>
+        <item>6x (12x Speed)</item>
+        <item>7x (14x Speed)</item>
+        <item>8x (16x Speed)</item>
+        <item>9x (18x Speed)</item>
+        <item>10x (20x Speed)</item>
+    </string-array>
+    <string-array name="settings_cdrom_read_speedup_values">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+    </string-array>
 </resources>
diff --git a/android/app/src/main/res/xml/root_preferences.xml b/android/app/src/main/res/xml/root_preferences.xml
index 0fa2bc5cd..86364a756 100644
--- a/android/app/src/main/res/xml/root_preferences.xml
+++ b/android/app/src/main/res/xml/root_preferences.xml
@@ -107,6 +107,30 @@
             app:useSimpleSummaryProvider="true"
             app:iconSpaceReserved="false" />
 
+        <SwitchPreferenceCompat
+            app:key="CDROM/RegionCheck"
+            app:title="CD-ROM Region Check"
+            app:defaultValue="false"
+            app:summary="Prevents discs from incorrect regions being read by the emulator. Usually safe to disable."
+            app:iconSpaceReserved="false" />
+
+        <ListPreference
+            app:key="CDROM/ReadSpeedup"
+            app:title="CD-ROM Read Speedup"
+            app:entries="@array/settings_cdrom_read_speedup_entries"
+            app:entryValues="@array/settings_cdrom_read_speedup_values"
+            app:defaultValue="1"
+            app:summary="Speeds up CD-ROM reads by the specified factor. Only applies to double-speed reads, and is ignored when audio is playing. May improve loading speeds in some games, at the cost of breaking others."
+            app:useSimpleSummaryProvider="true"
+            app:iconSpaceReserved="false" />
+
+        <SwitchPreferenceCompat
+            app:key="CDROM/MuteCDAudio"
+            app:title="Mute CD Audio"
+            app:defaultValue="false"
+            app:summary="Forcibly mutes both CD-DA and XA audio from the CD-ROM. Can be used to disable background music in some games."
+            app:iconSpaceReserved="false" />
+
         <SwitchPreferenceCompat
             app:key="BIOS/PatchFastBoot"
             app:title="@string/settings_console_fast_boot"
@@ -169,6 +193,13 @@
             app:summary="Scales vertex positions in screen-space to a widescreen aspect ratio, essentially increasing the field of view from 4:3 to 16:9 in 3D games. For 2D games, or games which use pre-rendered backgrounds, this enhancement will not work as expected. May not be compatible with all games."
             app:iconSpaceReserved="false" />
 
+        <SwitchPreferenceCompat
+            app:key="Display/Force4_3For24Bit"
+            app:title="Force 4:3 For 24-Bit Display"
+            app:defaultValue="false"
+            app:summary="Switches back to 4:3 display aspect ratio when displaying 24-bit content, usually FMVs."
+            app:iconSpaceReserved="false" />
+
         <SwitchPreferenceCompat
             app:key="GPU/PGXPEnable"
             app:title="PGXP Geometry Correction"