From 6b2089a73c2d13b6f21ea0b73854ae7ca8a9e069 Mon Sep 17 00:00:00 2001
From: Matteo Hausner <matteo.hausner@gmail.com>
Date: Sat, 18 Jan 2014 17:33:31 +0100
Subject: [PATCH] Renamed ControllersFragment to InputFragment to better
 reflect that all input settings are found in there Greatly improved layout
 for all input related stuff Added an input icon(!) Fixed / improved some
 input related strings

---
 shell/android/res/drawable/input.png          | Bin 0 -> 4289 bytes
 .../res/layout/controllers_fragment.xml       | 207 ---------------
 shell/android/res/layout/input_fragment.xml   | 244 ++++++++++++++++++
 shell/android/res/values-jp/strings.xml       |  20 +-
 shell/android/res/values/strings.xml          |  16 +-
 ...ollersFragment.java => InputFragment.java} |   4 +-
 .../com/reicast/emulator/MainActivity.java    |  10 +-
 7 files changed, 271 insertions(+), 230 deletions(-)
 create mode 100644 shell/android/res/drawable/input.png
 delete mode 100644 shell/android/res/layout/controllers_fragment.xml
 create mode 100644 shell/android/res/layout/input_fragment.xml
 rename shell/android/src/com/reicast/emulator/{ControllersFragment.java => InputFragment.java} (98%)

diff --git a/shell/android/res/drawable/input.png b/shell/android/res/drawable/input.png
new file mode 100644
index 0000000000000000000000000000000000000000..019545823c949214b41d70b01a59e391c25361b8
GIT binary patch
literal 4289
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

literal 0
HcmV?d00001

diff --git a/shell/android/res/layout/controllers_fragment.xml b/shell/android/res/layout/controllers_fragment.xml
deleted file mode 100644
index 4ff4bd864..000000000
--- a/shell/android/res/layout/controllers_fragment.xml
+++ /dev/null
@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-    <TableLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:stretchColumns="*" >
-
-        <TableRow android:gravity="center_vertical" >
-
-        <TextView
-            android:layout_weight="1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ems="10"
-            android:text="@string/customize_touch_controls" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="right"
-                android:orientation="vertical" >
-
-		<Button
-		    android:layout_weight="1"
-		    android:id="@+id/buttonLaunchEditor"
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-		    android:text="@string/launch_editor" />
-            </LinearLayout>
-        </TableRow>
-
-
-        <TableRow android:gravity="center_vertical" >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.5"
-                android:ems="10"
-                android:gravity="center_vertical|left"
-                android:text="@string/touch_vibration" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="right"
-                android:orientation="vertical" >
-
-                <de.ankri.views.Switch
-                    android:id="@+id/switchTouchVibrationEnabled"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content" />
-            </LinearLayout>
-        </TableRow>
-
-     <TableRow android:gravity="center_vertical" >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ems="10"
-            android:gravity="center_vertical|left"
-            android:text="@string/controller_1" />
-
-        <TextView
-            android:id="@+id/textViewDeviceDescriptorPlayer1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ems="10"
-            android:gravity="center_vertical|left"
-            android:text="@string/controller_none_selected" />
-
-        <Button
-            android:id="@+id/buttonSelectControllerPlayer1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="right"
-            android:text="@string/select_controller" />
-
-        <Button
-            android:id="@+id/buttonRemoveControllerPlayer1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="right"
-            android:text="@string/remove_controller" />
-   </TableRow>
-
-     <TableRow android:gravity="center_vertical" >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ems="10"
-            android:gravity="center_vertical|left"
-            android:text="@string/controller_2" />
-
-        <TextView
-            android:id="@+id/textViewDeviceDescriptorPlayer2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ems="10"
-            android:gravity="center_vertical|left"
-            android:text="@string/controller_none_selected" />
-
-        <Button
-            android:id="@+id/buttonSelectControllerPlayer2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="right"
-            android:text="@string/select_controller" />
-
-        <Button
-            android:id="@+id/buttonRemoveControllerPlayer2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="right"
-            android:text="@string/remove_controller" />
-   </TableRow>
-
-     <TableRow android:gravity="center_vertical" >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ems="10"
-            android:gravity="center_vertical|left"
-            android:text="@string/controller_3" />
-
-        <TextView
-            android:id="@+id/textViewDeviceDescriptorPlayer3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ems="10"
-            android:gravity="center_vertical|left"
-            android:text="@string/controller_none_selected" />
-
-        <Button
-            android:id="@+id/buttonSelectControllerPlayer3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="right"
-            android:text="@string/select_controller" />
-
-        <Button
-            android:id="@+id/buttonRemoveControllerPlayer3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="right"
-            android:text="@string/remove_controller" />
-    </TableRow>
-
-     <TableRow android:gravity="center_vertical" >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ems="10"
-            android:gravity="center_vertical|left"
-            android:text="@string/controller_4" />
-
-        <TextView
-            android:id="@+id/textViewDeviceDescriptorPlayer4"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ems="10"
-            android:gravity="center_vertical|left"
-            android:text="@string/controller_none_selected" />
-
-        <Button
-            android:id="@+id/buttonSelectControllerPlayer4"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="right"
-            android:text="@string/select_controller" />
-
-        <Button
-            android:id="@+id/buttonRemoveControllerPlayer4"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="right"
-            android:text="@string/remove_controller" />
-        </TableRow>
-    </TableLayout>
-
-</LinearLayout>
diff --git a/shell/android/res/layout/input_fragment.xml b/shell/android/res/layout/input_fragment.xml
new file mode 100644
index 000000000..dc96cd43a
--- /dev/null
+++ b/shell/android/res/layout/input_fragment.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+
+    <TableLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:stretchColumns="*" >
+
+        <TableRow android:gravity="center_vertical" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:text="@string/customize_touch_controls" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:orientation="vertical" >
+
+                <Button
+                    android:id="@+id/buttonLaunchEditor"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="8"
+                    android:text="@string/launch_editor" />
+            </LinearLayout>
+        </TableRow>
+
+        <TableRow
+            android:layout_marginTop="25dp"
+            android:gravity="center_vertical" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0.5"
+                android:ems="10"
+                android:gravity="center_vertical|left"
+                android:text="@string/touch_vibration" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="right"
+                android:orientation="vertical" >
+
+                <de.ankri.views.Switch
+                    android:id="@+id/switchTouchVibrationEnabled"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+        </TableRow>
+
+        <TableRow
+            android:layout_marginTop="25dp"
+            android:gravity="center_vertical" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:gravity="center_vertical|left"
+                android:text="@string/controller_a" />
+
+            <TextView
+                android:id="@+id/textViewDeviceDescriptorPlayer1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:gravity="center_vertical|left"
+                android:text="@string/controller_none_selected" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:orientation="vertical" >
+
+                <Button
+                    android:id="@+id/buttonSelectControllerPlayer1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="6"
+                    android:text="@string/select" />
+
+                <Button
+                    android:id="@+id/buttonRemoveControllerPlayer1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="6"
+                    android:text="@string/remove" />
+            </LinearLayout>
+        </TableRow>
+
+        <TableRow
+            android:layout_marginTop="25dp"
+            android:gravity="center_vertical" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:gravity="center_vertical|left"
+                android:text="@string/controller_b" />
+
+            <TextView
+                android:id="@+id/textViewDeviceDescriptorPlayer2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:gravity="center_vertical|left"
+                android:text="@string/controller_none_selected" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:orientation="vertical" >
+
+                <Button
+                    android:id="@+id/buttonSelectControllerPlayer2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="6"
+                    android:text="@string/select" />
+
+                <Button
+                    android:id="@+id/buttonRemoveControllerPlayer2"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="6"
+                    android:text="@string/remove" />
+            </LinearLayout>
+        </TableRow>
+
+        <TableRow
+            android:layout_marginTop="25dp"
+            android:gravity="center_vertical" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:gravity="center_vertical|left"
+                android:text="@string/controller_c" />
+
+            <TextView
+                android:id="@+id/textViewDeviceDescriptorPlayer3"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:gravity="center_vertical|left"
+                android:text="@string/controller_none_selected" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:orientation="vertical" >
+
+                <Button
+                    android:id="@+id/buttonSelectControllerPlayer3"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="6"
+                    android:text="@string/select" />
+
+                <Button
+                    android:id="@+id/buttonRemoveControllerPlayer3"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="6"
+                    android:text="@string/remove" />
+            </LinearLayout>
+        </TableRow>
+
+        <TableRow
+            android:layout_marginTop="25dp"
+            android:gravity="center_vertical" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:gravity="center_vertical|left"
+                android:text="@string/controller_d" />
+
+            <TextView
+                android:id="@+id/textViewDeviceDescriptorPlayer4"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:gravity="center_vertical|left"
+                android:text="@string/controller_none_selected" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:orientation="vertical" >
+
+                <Button
+                    android:id="@+id/buttonSelectControllerPlayer4"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="6"
+                    android:text="@string/select" />
+
+                <Button
+                    android:id="@+id/buttonRemoveControllerPlayer4"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="6"
+                    android:text="@string/remove" />
+            </LinearLayout>
+        </TableRow>
+    </TableLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/shell/android/res/values-jp/strings.xml b/shell/android/res/values-jp/strings.xml
index 99182ebfe..55c638f64 100644
--- a/shell/android/res/values-jp/strings.xml
+++ b/shell/android/res/values-jp/strings.xml
@@ -28,13 +28,17 @@
 
     <string name="games_listing">利用可能なドリームキャストのゲーム</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="controller_none">None</string>
-    <string name="select_controller">セレクトコントローラ</string>
-    <string name="remove_controller">コントローラを取り外し</string>
+    <string name="customize_touch_controls">Customize Touch Controls</string>
+    <string name="launch_editor">Launch Editor</string>
+    <string name="touch_vibration">Touch Vibration</string>
+    <string name="controller_a">コントローラ A</string>
+    <string name="controller_b">コントローラ B</string>
+    <string name="controller_c">コントローラ C</string>
+    <string name="controller_d">コントローラ D</string>
+    <string name="controller_not_connected">Controller Not Connected</string>
+    <string name="controller_none_selected">No Controller Selected</string>
+    <string name="select">選択する</string>
+    <string name="remove">削除する</string>
     <string name="select_controller_title">セレクトコントローラ</string>
     <string name="select_controller_message">ポートに割り当てるコントローラのいずれかのボタンを押してください</string>
     <string name="controller_already_in_use">このコントローラは、すでに使用されています！</string>
@@ -77,4 +81,4 @@
     <!-- Content Description -->
     <string name="desc_list_item_icon">Item Icon</string>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/shell/android/res/values/strings.xml b/shell/android/res/values/strings.xml
index 38708adc1..38cefe44d 100644
--- a/shell/android/res/values/strings.xml
+++ b/shell/android/res/values/strings.xml
@@ -31,14 +31,14 @@
     <string name="customize_touch_controls">Customize Touch Controls</string>
     <string name="launch_editor">Launch Editor</string>
     <string name="touch_vibration">Touch Vibration</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="controller_a">Controller A</string>
+    <string name="controller_b">Controller B</string>
+    <string name="controller_c">Controller C</string>
+    <string name="controller_d">Controller D</string>
     <string name="controller_not_connected">Controller Not Connected</string>
     <string name="controller_none_selected">No Controller Selected</string>
-    <string name="select_controller">Select Controller</string>
-    <string name="remove_controller">Remove Controller</string>
+    <string name="select">Select</string>
+    <string name="remove">Remove</string>
     <string name="select_controller_title">Select Controller</string>
     <string name="select_controller_message">Press any button on the controller to assign to port</string>
     <string name="controller_already_in_use">This controller is already in use!</string>
@@ -67,7 +67,7 @@
         <item>Browser</item>
         <item>Settings</item>
         <item>Paths</item>
-        <item>Controllers</item>
+        <item>Input</item>
         <item>About</item>
     </string-array>
 
@@ -77,7 +77,7 @@
         <item>@drawable/disk_unknown</item>
         <item>@drawable/config</item>
         <item>@drawable/open_folder</item>
-        <item>@drawable/config</item>
+        <item>@drawable/input</item>
         <item>@drawable/question</item>
     </array>
 
diff --git a/shell/android/src/com/reicast/emulator/ControllersFragment.java b/shell/android/src/com/reicast/emulator/InputFragment.java
similarity index 98%
rename from shell/android/src/com/reicast/emulator/ControllersFragment.java
rename to shell/android/src/com/reicast/emulator/InputFragment.java
index 74b7cd0e8..7f798c733 100644
--- a/shell/android/src/com/reicast/emulator/ControllersFragment.java
+++ b/shell/android/src/com/reicast/emulator/InputFragment.java
@@ -25,7 +25,7 @@ import android.widget.Toast;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 
 @TargetApi(Build.VERSION_CODES.JELLY_BEAN)
-public class ControllersFragment extends Fragment {
+public class InputFragment extends Fragment {
 
 	private Activity parentActivity;
 	private int listenForButton = 0;
@@ -42,7 +42,7 @@ public class ControllersFragment extends Fragment {
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 			Bundle savedInstanceState) {
 		// Inflate the layout for this fragment
-		return inflater.inflate(R.layout.controllers_fragment, container, false);
+		return inflater.inflate(R.layout.input_fragment, container, false);
 	}
 
 	@Override
diff --git a/shell/android/src/com/reicast/emulator/MainActivity.java b/shell/android/src/com/reicast/emulator/MainActivity.java
index 93640a6f4..3ec5b8e2e 100644
--- a/shell/android/src/com/reicast/emulator/MainActivity.java
+++ b/shell/android/src/com/reicast/emulator/MainActivity.java
@@ -121,7 +121,7 @@ public class MainActivity extends FragmentActivity implements
 			// Paths
 			navDrawerItems.add(new NavDrawerItem(navMenuTitles[2], navMenuIcons
 					.getResourceId(2, 0)));
-			// Controllers
+			// Input
 			navDrawerItems.add(new NavDrawerItem(navMenuTitles[3], navMenuIcons
 					.getResourceId(3, 0)));
 			// About
@@ -437,15 +437,15 @@ public class MainActivity extends FragmentActivity implements
 			frag_tag = "OPTIONS_FRAG";
 			break;
 		case 3:
-			fragment = (ControllersFragment) getSupportFragmentManager()
-					.findFragmentByTag("CONTROLLERS_FRAG");
+			fragment = (InputFragment) getSupportFragmentManager()
+					.findFragmentByTag("INPUT_FRAG");
 			if (fragment != null) {
 				if (fragment.isVisible()) {
 					return;
 				}
 			}
-			fragment = new ControllersFragment();
-			frag_tag = "CONTROLLERS_FRAG";
+			fragment = new InputFragment();
+			frag_tag = "INPUT_FRAG";
 			break;
 		case 4:
 			fragment = null;