From 53ab104d5f1a9523dbd2e12adb0a131c052d90e8 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Tue, 19 Nov 2013 15:53:30 -0500
Subject: [Android] Expand the input binding UI in the settings to handle 4
 Gamecube controllers in the future.

Other changes:

 - Broke out MotionAlertDialog into it's own separate class.
 - Made a preference specifically for handling input bindings.
---
 Source/Android/res/values-ja/strings.xml |   4 +
 Source/Android/res/values/strings.xml    |   4 +
 Source/Android/res/xml/input_prefs.xml   | 414 +++++++++++++++++++++++++------
 3 files changed, 341 insertions(+), 81 deletions(-)

(limited to 'Source/Android/res')

diff --git a/Source/Android/res/values-ja/strings.xml b/Source/Android/res/values-ja/strings.xml
index 598799c30e..bab1991ce3 100644
--- a/Source/Android/res/values-ja/strings.xml
+++ b/Source/Android/res/values-ja/strings.xml
@@ -46,6 +46,10 @@
     <string name="input_overlay_layout">入力オーバーレイレイアウト</string>
     <string name="input_overlay_layout_desc">入力オーバーレイのためのボタンのレイアウト。</string>
     <string name="gamecube_bindings">ゲームキューブの入力バインディング</string>
+    <string name="controller_1">コントローラ1</string>
+    <string name="controller_2">コントローラ2</string>
+    <string name="controller_3">コントローラ3</string>
+    <string name="controller_4">コントローラ4</string>
     <string name="input_binding">入力バインディング</string>
     <string name="input_binding_descrip">%1$sにバインドするための入力を移動または押してください。</string>
     <string name="button_a">Aボタン</string>
diff --git a/Source/Android/res/values/strings.xml b/Source/Android/res/values/strings.xml
index 517a80dbd3..353559a0ed 100644
--- a/Source/Android/res/values/strings.xml
+++ b/Source/Android/res/values/strings.xml
@@ -46,6 +46,10 @@
     <string name="input_overlay_layout">Input Overlay Layout</string>
     <string name="input_overlay_layout_desc">Button layout for the input overlay.</string>
     <string name="gamecube_bindings">Gamecube Input Bindings</string>
+    <string name="controller_1">Controller 1</string>
+    <string name="controller_2">Controller 2</string>
+    <string name="controller_3">Controller 3</string>
+    <string name="controller_4">Controller 4</string>
     <string name="input_binding">Input Binding</string>
     <string name="input_binding_descrip">Press or move an input to bind it to %1$s.</string>
     <string name="button_a">Button A</string>
diff --git a/Source/Android/res/xml/input_prefs.xml b/Source/Android/res/xml/input_prefs.xml
index afd32b476b..30b069c37a 100644
--- a/Source/Android/res/xml/input_prefs.xml
+++ b/Source/Android/res/xml/input_prefs.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   android:title="@string/input_settings">
-                  
+
     <Preference
         android:key="inputOverlayConfigPref"
         android:summary="@string/input_overlay_layout_desc"
@@ -11,84 +10,337 @@
     <PreferenceScreen
         android:key="gamecube_bindings"
         android:title="@string/gamecube_bindings">
-        <Preference
-            android:key="InputA"
-            android:title="@string/button_a" />
-    
-        <Preference
-            android:key="InputB"
-            android:title="@string/button_b" />
-    
-        <Preference
-            android:key="InputX"
-            android:title="@string/button_x" />
-    
-        <Preference
-            android:key="InputY"
-            android:title="@string/button_y" />
-    
-        <Preference
-            android:key="InputZ"
-            android:title="@string/button_z" />
-    
-        <Preference
-            android:key="InputStart"
-            android:title="@string/button_start" />
-    
-        <Preference
-            android:key="DPadUp"
-            android:title="@string/dpad_up" />
-    
-        <Preference
-            android:key="DPadDown"
-            android:title="@string/dpad_down" />
-    
-        <Preference
-               android:key="DPadLeft"
-               android:title="@string/dpad_left" />
-    
-        <Preference
-               android:key="DPadRight"
-               android:title="@string/dpad_right" />
-    
-        <Preference
-            android:key="MainUp"
-            android:title="@string/main_stick_up" />
-    
-        <Preference
-            android:key="MainDown"
-            android:title="@string/main_stick_down" />
-    
-        <Preference
-            android:key="MainLeft"
-            android:title="@string/main_stick_left" />
-    
-        <Preference
-            android:key="MainRight"
-            android:title="@string/main_stick_right" />
-    
-        <Preference
-            android:key="CStickUp"
-            android:title="@string/c_stick_up" />
-    
-        <Preference
-            android:key="CStickDown"
-            android:title="@string/c_stick_down" />
-    
-        <Preference
-            android:key="CStickLeft"
-            android:title="@string/c_stick_left" />
-    
-        <Preference
-            android:key="CStickRight"
-            android:title="@string/c_stick_right" />
-    
-        <Preference
-            android:key="InputL"
-            android:title="@string/trigger_left" />
-        
-        <Preference
-            android:key="InputR"
-            android:title="@string/trigger_right" />
+        <PreferenceScreen
+            android:key="gamecube_bindings_control_1"
+            android:title="@string/controller_1">
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputA_1"
+                android:title="@string/button_a" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputB_1"
+                android:title="@string/button_b" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputX_1"
+                android:title="@string/button_x" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputY_1"
+                android:title="@string/button_y" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputZ_1"
+                android:title="@string/button_z" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputStart_1"
+                android:title="@string/button_start" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="DPadUp_1"
+                android:title="@string/dpad_up" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="DPadDown_1"
+                android:title="@string/dpad_down" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="DPadLeft_1"
+                android:title="@string/dpad_left" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="DPadRight_1"
+                android:title="@string/dpad_right" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="MainUp_1"
+                android:title="@string/main_stick_up" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="MainDown_1"
+                android:title="@string/main_stick_down" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="MainLeft_1"
+                android:title="@string/main_stick_left" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="MainRight_1"
+                android:title="@string/main_stick_right" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="CStickUp_1"
+                android:title="@string/c_stick_up" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="CStickDown_1"
+                android:title="@string/c_stick_down" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="CStickLeft_1"
+                android:title="@string/c_stick_left" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="CStickRight_1"
+                android:title="@string/c_stick_right" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputL_1"
+                android:title="@string/trigger_left" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputR_1"
+                android:title="@string/trigger_right" />
+        </PreferenceScreen>
+        <PreferenceScreen
+            android:key="gamecube_bindings_control_2"
+            android:title="@string/controller_2">
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputA_2"
+                android:title="@string/button_a" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputB_2"
+                android:title="@string/button_b" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputX_2"
+                android:title="@string/button_x" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputY_2"
+                android:title="@string/button_y" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputZ_2"
+                android:title="@string/button_z" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputStart_2"
+                android:title="@string/button_start" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="DPadUp_2"
+                android:title="@string/dpad_up" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="DPadDown_2"
+                android:title="@string/dpad_down" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="DPadLeft_2"
+                android:title="@string/dpad_left" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="DPadRight_2"
+                android:title="@string/dpad_right" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="MainUp_2"
+                android:title="@string/main_stick_up" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="MainDown_2"
+                android:title="@string/main_stick_down" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="MainLeft_2"
+                android:title="@string/main_stick_left" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="MainRight_2"
+                android:title="@string/main_stick_right" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="CStickUp_2"
+                android:title="@string/c_stick_up" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="CStickDown_2"
+                android:title="@string/c_stick_down" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="CStickLeft_2"
+                android:title="@string/c_stick_left" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="CStickRight_2"
+                android:title="@string/c_stick_right" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputL_2"
+                android:title="@string/trigger_left" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputR_2"
+                android:title="@string/trigger_right" />
+        </PreferenceScreen>
+        <PreferenceScreen
+            android:key="gamecube_bindings_control_3"
+            android:title="@string/controller_3">
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputA_3"
+                android:title="@string/button_a" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputB_3"
+                android:title="@string/button_b" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputX_3"
+                android:title="@string/button_x" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputY_3"
+                android:title="@string/button_y" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputZ_3"
+                android:title="@string/button_z" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputStart_3"
+                android:title="@string/button_start" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="DPadUp_3"
+                android:title="@string/dpad_up" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="DPadDown_3"
+                android:title="@string/dpad_down" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="DPadLeft_3"
+                android:title="@string/dpad_left" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="DPadRight_3"
+                android:title="@string/dpad_right" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="MainUp_3"
+                android:title="@string/main_stick_up" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="MainDown_3"
+                android:title="@string/main_stick_down" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="MainLeft_3"
+                android:title="@string/main_stick_left" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="MainRight_3"
+                android:title="@string/main_stick_right" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="CStickUp_3"
+                android:title="@string/c_stick_up" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="CStickDown_3"
+                android:title="@string/c_stick_down" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="CStickLeft_3"
+                android:title="@string/c_stick_left" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="CStickRight_3"
+                android:title="@string/c_stick_right" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputL_3"
+                android:title="@string/trigger_left" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputR_3"
+                android:title="@string/trigger_right" />
+        </PreferenceScreen>
+        <PreferenceScreen
+            android:key="gamecube_bindings_control_4"
+            android:title="@string/controller_4">
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputA_4"
+                android:title="@string/button_a" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputB_4"
+                android:title="@string/button_b" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputX_4"
+                android:title="@string/button_x" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputY_4"
+                android:title="@string/button_y" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputZ_4"
+                android:title="@string/button_z" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputStart_4"
+                android:title="@string/button_start" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="DPadUp_4"
+                android:title="@string/dpad_up" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="DPadDown_4"
+                android:title="@string/dpad_down" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="DPadLeft_4"
+                android:title="@string/dpad_left" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="DPadRight_4"
+                android:title="@string/dpad_right" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="MainUp_4"
+                android:title="@string/main_stick_up" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="MainDown_4"
+                android:title="@string/main_stick_down" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="MainLeft_4"
+                android:title="@string/main_stick_left" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="MainRight_4"
+                android:title="@string/main_stick_right" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="CStickUp_4"
+                android:title="@string/c_stick_up" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="CStickDown_4"
+                android:title="@string/c_stick_down" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="CStickLeft_4"
+                android:title="@string/c_stick_left" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="CStickRight_4"
+                android:title="@string/c_stick_right" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputL_4"
+                android:title="@string/trigger_left" />
+
+            <org.dolphinemu.dolphinemu.settings.input.InputBindingPreference
+                android:key="InputR_4"
+                android:title="@string/trigger_right" />
+        </PreferenceScreen>
     </PreferenceScreen>
 </PreferenceScreen>
\ No newline at end of file
-- 
cgit v1.2.3