From a34f0d55996fd155a5c355be617e69eeb51ca61a Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Tue, 16 Mar 2021 01:09:57 +1000
Subject: [PATCH] Android: Add controller settings to ingame menu

---
 .../com/github/stenzek/duckstation/EmulationActivity.java | 8 ++++++++
 android/app/src/main/res/values-es/arrays.xml             | 1 +
 android/app/src/main/res/values-it/arrays.xml             | 1 +
 android/app/src/main/res/values-nl/arrays.xml             | 1 +
 android/app/src/main/res/values-pt-rBR/arrays.xml         | 1 +
 android/app/src/main/res/values-ru/arrays.xml             | 1 +
 android/app/src/main/res/values/arrays.xml                | 1 +
 7 files changed, 14 insertions(+)

diff --git a/android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java b/android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java
index d96263c13..04b88fb61 100644
--- a/android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java
+++ b/android/app/src/main/java/com/github/stenzek/duckstation/EmulationActivity.java
@@ -547,6 +547,14 @@ public class EmulationActivity extends AppCompatActivity implements SurfaceHolde
                 }
 
                 case 4:     // Settings
+                {
+                    Intent intent = new Intent(EmulationActivity.this, ControllerSettingsActivity.class);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                    startActivityForResult(intent, REQUEST_CODE_SETTINGS);
+                    return;
+                }
+
+                case 5:     // Controller Settings
                 {
                     Intent intent = new Intent(EmulationActivity.this, SettingsActivity.class);
                     intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
diff --git a/android/app/src/main/res/values-es/arrays.xml b/android/app/src/main/res/values-es/arrays.xml
index a5724e92e..34d67b4fa 100644
--- a/android/app/src/main/res/values-es/arrays.xml
+++ b/android/app/src/main/res/values-es/arrays.xml
@@ -94,6 +94,7 @@
         <item>Código de Trucos</item>
         <item>Cambiar Disco</item>
         <item>Cambiar Control de Pantalla Tactil</item>
+        <item>Controller Settings</item>
         <item>Configuraciones</item>
     </string-array>
     <string-array name="settings_cdrom_read_speedup_entries">
diff --git a/android/app/src/main/res/values-it/arrays.xml b/android/app/src/main/res/values-it/arrays.xml
index abaadd120..784c163b0 100644
--- a/android/app/src/main/res/values-it/arrays.xml
+++ b/android/app/src/main/res/values-it/arrays.xml
@@ -94,6 +94,7 @@
         <item>Codici Patch</item>
         <item>Cambia Disco</item>
         <item>Cambia Controller Touchscreen</item>
+        <item>Controller Settings</item>
         <item>Impostazioni</item>
     </string-array>
     <string-array name="settings_cdrom_read_speedup_entries">
diff --git a/android/app/src/main/res/values-nl/arrays.xml b/android/app/src/main/res/values-nl/arrays.xml
index 0d36a1d14..4fdd4410c 100644
--- a/android/app/src/main/res/values-nl/arrays.xml
+++ b/android/app/src/main/res/values-nl/arrays.xml
@@ -94,6 +94,7 @@
         <item>Patch Codes</item>
         <item>Disc Veranderen</item>
         <item>Touchscreen Controller Aanpassen</item>
+        <item>Controller Settings</item>
         <item>Instellingen</item>
     </string-array>
     <string-array name="settings_cdrom_read_speedup_entries">
diff --git a/android/app/src/main/res/values-pt-rBR/arrays.xml b/android/app/src/main/res/values-pt-rBR/arrays.xml
index bbcebd28e..450b4ba2b 100644
--- a/android/app/src/main/res/values-pt-rBR/arrays.xml
+++ b/android/app/src/main/res/values-pt-rBR/arrays.xml
@@ -94,6 +94,7 @@
         <item>Trapaças</item>
         <item>Mudar Disco</item>
         <item>Mudar controle em Tela</item>
+        <item>Controller Settings</item>
         <item>Configurações</item>
     </string-array>
 		<string-array name="emulation_touchscreen_menu">
diff --git a/android/app/src/main/res/values-ru/arrays.xml b/android/app/src/main/res/values-ru/arrays.xml
index 13fea13c6..f27093454 100644
--- a/android/app/src/main/res/values-ru/arrays.xml
+++ b/android/app/src/main/res/values-ru/arrays.xml
@@ -94,6 +94,7 @@
 		<item>Чит-коды</item>
 		<item>Сменить диск</item>
 		<item>Настроить экранный геймпад</item>
+		<item>Controller Settings</item>
 		<item>Настройки эмулятора</item>
 	</string-array>
 	<string-array name="emulation_touchscreen_menu">
diff --git a/android/app/src/main/res/values/arrays.xml b/android/app/src/main/res/values/arrays.xml
index f9573a275..01a9ae0c5 100644
--- a/android/app/src/main/res/values/arrays.xml
+++ b/android/app/src/main/res/values/arrays.xml
@@ -176,6 +176,7 @@
         <item>Patch Codes</item>
         <item>Change Disc</item>
         <item>Change Touchscreen Controller</item>
+        <item>Controller Settings</item>
         <item>Settings</item>
     </string-array>
     <string-array name="emulation_touchscreen_menu">