From a63cede6bc0811b541c328a31266b75f55252f38 Mon Sep 17 00:00:00 2001
From: TwistedUmbrella <twistedumbrella@gmail.com>
Date: Thu, 23 Jan 2014 00:18:11 -0500
Subject: [PATCH 1/7] Add a generic function to modify the button assignments

This should support a per-player option in the future.
---
 shell/android/res/layout/input_fragment.xml   |  11 +
 .../android/res/layout/input_mod_fragment.xml | 335 +++++++++++++
 shell/android/res/values/strings.xml          |   4 +
 .../com/reicast/emulator/GL2JNIActivity.java  | 446 ++++++++++--------
 .../com/reicast/emulator/InputFragment.java   |  18 +-
 .../reicast/emulator/InputModFragment.java    | 239 ++++++++++
 .../src/com/reicast/emulator/MOGAInput.java   |  47 +-
 7 files changed, 904 insertions(+), 196 deletions(-)
 create mode 100644 shell/android/res/layout/input_mod_fragment.xml
 create mode 100644 shell/android/src/com/reicast/emulator/InputModFragment.java

diff --git a/shell/android/res/layout/input_fragment.xml b/shell/android/res/layout/input_fragment.xml
index bdde31490..cf0007d6a 100644
--- a/shell/android/res/layout/input_fragment.xml
+++ b/shell/android/res/layout/input_fragment.xml
@@ -252,6 +252,17 @@
                     android:text="@string/remove" />
             </LinearLayout>
         </TableRow>
+        <TableRow android:gravity="center_vertical" >
+
+            <Button
+                android:id="@+id/buttonKeycodeEditor"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="25dp"
+                android:layout_weight="1"
+                android:ems="8"
+                android:text="@string/menu_edit_keycodes" />
+        </TableRow>
     </TableLayout>
 
 </LinearLayout>
diff --git a/shell/android/res/layout/input_mod_fragment.xml b/shell/android/res/layout/input_mod_fragment.xml
new file mode 100644
index 000000000..c8b2342ac
--- /dev/null
+++ b/shell/android/res/layout/input_mod_fragment.xml
@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+<LinearLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical" >
+
+    <TableLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:stretchColumns="*" >
+
+        <TableRow android:gravity="center_vertical" >
+
+            <TextView
+                android:id="@+id/a_button_key"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:text="A button" />
+
+            <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/a_button_edit"
+                    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:gravity="center_vertical" >
+
+            <TextView
+                android:id="@+id/b_button_key"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:text="B button" />
+
+            <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/b_button_edit"
+                    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:gravity="center_vertical" >
+
+            <TextView
+                android:id="@+id/x_button_key"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:text="X button" />
+
+            <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/x_button_edit"
+                    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:gravity="center_vertical" >
+
+            <TextView
+                android:id="@+id/y_button_key"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:text="Y button" />
+
+            <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/y_button_edit"
+                    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:gravity="center_vertical" >
+
+            <TextView
+                android:id="@+id/l_button_key"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:text="L button" />
+
+            <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/l_button_edit"
+                    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:gravity="center_vertical" >
+
+            <TextView
+                android:id="@+id/r_button_key"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:text="R button" />
+
+            <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/r_button_edit"
+                    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:gravity="center_vertical" >
+
+            <TextView
+                android:id="@+id/joystick_key"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:text="Joystick" />
+
+            <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/joystick_edit"
+                    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:gravity="center_vertical" >
+
+            <TextView
+                android:id="@+id/dpad_left_key"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:text="DPad Left" />
+
+            <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/dpad_left_edit"
+                    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:gravity="center_vertical" >
+
+            <TextView
+                android:id="@+id/dpad_right_key"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:text="DPad Right" />
+
+            <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/dpad_right_edit"
+                    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:gravity="center_vertical" >
+
+            <TextView
+                android:id="@+id/dpad_up_key"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:text="DPad Up" />
+
+            <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/dpad_up_edit"
+                    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:gravity="center_vertical" >
+
+            <TextView
+                android:id="@+id/dpad_down_key"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:text="DPad Down" />
+
+            <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/dpad_down_edit"
+                    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:gravity="center_vertical" >
+
+            <TextView
+                android:id="@+id/start_button_key"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ems="10"
+                android:text="Start Button" />
+
+            <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/start_button_edit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:ems="8"
+                    android:text="@string/launch_editor" />
+            </LinearLayout>
+        </TableRow>
+    </TableLayout>
+
+</LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/shell/android/res/values/strings.xml b/shell/android/res/values/strings.xml
index 0bf1ba3b6..36bd05bef 100644
--- a/shell/android/res/values/strings.xml
+++ b/shell/android/res/values/strings.xml
@@ -42,6 +42,10 @@
     <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>
+    
+    <string name="menu_edit_keycodes">Edit Key Bindings</string>
+    <string name="map_keycode_title">Modify Controller</string>
+    <string name="map_keycode_message">Press the new controller button for %1$s</string>
 
     <string name="about_title">About reicast</string>
     <string name="about_text">reicast is a dreamcast emulator\n\nVersion: %1$s\n\nWe work hard for you\nShare the love back and rate the app!</string>
diff --git a/shell/android/src/com/reicast/emulator/GL2JNIActivity.java b/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
index 07c6862a8..23deb85fe 100644
--- a/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
+++ b/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
@@ -39,8 +39,11 @@ public class GL2JNIActivity extends Activity {
 	PopupWindow popUp;
 	LayoutParams params;
 	MOGAInput moga = new MOGAInput();
-	static boolean[] xbox = { false, false, false, false }, nVidia = { false, false, false, false };
-	float[] globalLS_X = new float[4], globalLS_Y = new float[4], previousLS_X = new float[4], previousLS_Y = new float[4];
+	private SharedPreferences prefs;
+	static boolean[] xbox = { false, false, false, false }, nVidia = { false,
+			false, false, false };
+	float[] globalLS_X = new float[4], globalLS_Y = new float[4],
+			previousLS_X = new float[4], previousLS_Y = new float[4];
 
 	public static HashMap<Integer, String> deviceId_deviceDescriptor = new HashMap<Integer, String>();
 	public static HashMap<String, Integer> deviceDescriptor_PlayerNum = new HashMap<String, Integer>();
@@ -81,7 +84,8 @@ public class GL2JNIActivity extends Activity {
 
 		hlay.addView(addbut(R.drawable.close, new OnClickListener() {
 			public void onClick(View v) {
-				Intent inte = new Intent(GL2JNIActivity.this, MainActivity.class);
+				Intent inte = new Intent(GL2JNIActivity.this,
+						MainActivity.class);
 				startActivity(inte);
 				GL2JNIActivity.this.finish();
 			}
@@ -130,7 +134,7 @@ public class GL2JNIActivity extends Activity {
 	protected void onCreate(Bundle icicle) {
 		requestWindowFeature(Window.FEATURE_NO_TITLE);
 		moga.onCreate(this);
-		
+
 		createPopup();
 		/*
 		 * try { //int rID =
@@ -151,146 +155,158 @@ public class GL2JNIActivity extends Activity {
 		map = new int[4][];
 
 		// Populate device descriptor-to-player-map from preferences
-		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-		deviceDescriptor_PlayerNum.put(prefs.getString("device_descriptor_player_1", null), 0);
-		deviceDescriptor_PlayerNum.put(prefs.getString("device_descriptor_player_2", null), 1);
-		deviceDescriptor_PlayerNum.put(prefs.getString("device_descriptor_player_3", null), 2);
-		deviceDescriptor_PlayerNum.put(prefs.getString("device_descriptor_player_4", null), 3);
+		prefs = PreferenceManager.getDefaultSharedPreferences(this);
+		deviceDescriptor_PlayerNum.put(
+				prefs.getString("device_descriptor_player_1", null), 0);
+		deviceDescriptor_PlayerNum.put(
+				prefs.getString("device_descriptor_player_2", null), 1);
+		deviceDescriptor_PlayerNum.put(
+				prefs.getString("device_descriptor_player_3", null), 2);
+		deviceDescriptor_PlayerNum.put(
+				prefs.getString("device_descriptor_player_4", null), 3);
 
 		boolean controllerTwoConnected = false;
 		boolean controllerThreeConnected = false;
 		boolean controllerFourConnected = false;
 
-		for (HashMap.Entry<String, Integer> e : deviceDescriptor_PlayerNum.entrySet()) {
+		for (HashMap.Entry<String, Integer> e : deviceDescriptor_PlayerNum
+				.entrySet()) {
 			String descriptor = e.getKey();
 			Integer playerNum = e.getValue();
 
 			switch (playerNum) {
-				case 1:
-					if (descriptor != null)
-						controllerTwoConnected = true;
-					break;
-				case 2:
-					if (descriptor != null)
-						controllerThreeConnected = true;
-					break;
-				case 3:
-					if (descriptor != null)
-						controllerFourConnected = true;
-					break;
+			case 1:
+				if (descriptor != null)
+					controllerTwoConnected = true;
+				break;
+			case 2:
+				if (descriptor != null)
+					controllerThreeConnected = true;
+				break;
+			case 3:
+				if (descriptor != null)
+					controllerFourConnected = true;
+				break;
 			}
 		}
 
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
 
-		JNIdc.initControllers(new boolean[] {controllerTwoConnected, controllerThreeConnected, controllerFourConnected});
+			JNIdc.initControllers(new boolean[] { controllerTwoConnected,
+					controllerThreeConnected, controllerFourConnected });
 
-		int joys[] = InputDevice.getDeviceIds();
-		for (int i = 0; i < joys.length; i++) {
-			String descriptor = null;
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-				descriptor = InputDevice.getDevice(joys[i]).getDescriptor();
-			} else {
-				descriptor = InputDevice.getDevice(joys[i]).getName();
-			}
-			Log.d("reidc", "InputDevice ID: " + joys[i]);
-			Log.d("reidc", "InputDevice Name: "
-					+ InputDevice.getDevice(joys[i]).getName());
-			Log.d("reidc", "InputDevice Descriptor: " + descriptor);
-			deviceId_deviceDescriptor.put(joys[i], descriptor);
-		}
-
-		for (int i = 0; i < joys.length; i++) {
-			Integer playerNum = deviceDescriptor_PlayerNum.get(deviceId_deviceDescriptor.get(joys[i]));
-
-			if (playerNum != null) {
-
-			if (InputDevice.getDevice(joys[i]).getName()
-					.equals("Sony PLAYSTATION(R)3 Controller")) {
-				map[playerNum] = new int[] {
-						OuyaController.BUTTON_Y, key_CONT_Y,
-						OuyaController.BUTTON_U, key_CONT_X,
-						OuyaController.BUTTON_O, key_CONT_A,
-						OuyaController.BUTTON_A, key_CONT_B,
-
-							OuyaController.BUTTON_DPAD_UP, key_CONT_DPAD_UP,
-							OuyaController.BUTTON_DPAD_DOWN,
-							key_CONT_DPAD_DOWN,
-							OuyaController.BUTTON_DPAD_LEFT,
-							key_CONT_DPAD_LEFT,
-							OuyaController.BUTTON_DPAD_RIGHT,
-							key_CONT_DPAD_RIGHT,
-
-						OuyaController.BUTTON_MENU, key_CONT_START,
-						OuyaController.BUTTON_R1, key_CONT_START
-
-					};
-				} else if (InputDevice.getDevice(joys[i]).getName()
-					.equals("Microsoft X-Box 360 pad")) {
-					map[playerNum] = new int[] {
-							OuyaController.BUTTON_O, key_CONT_A,
-							OuyaController.BUTTON_A, key_CONT_B,
-							OuyaController.BUTTON_Y, key_CONT_Y,
-							OuyaController.BUTTON_U, key_CONT_X,
-
-							OuyaController.BUTTON_DPAD_UP, key_CONT_DPAD_UP,
-							OuyaController.BUTTON_DPAD_DOWN,
-							key_CONT_DPAD_DOWN,
-							OuyaController.BUTTON_DPAD_LEFT,
-							key_CONT_DPAD_LEFT,
-							OuyaController.BUTTON_DPAD_RIGHT,
-							key_CONT_DPAD_RIGHT,
-
-							OuyaController.BUTTON_MENU, key_CONT_START,
-							OuyaController.BUTTON_R1, key_CONT_START };
-
-					xbox[playerNum] = true;
-
-					globalLS_X[playerNum] = previousLS_X[playerNum] = 0.0f;
-					globalLS_Y[playerNum] = previousLS_Y[playerNum] = 0.0f;
-				} else if (InputDevice.getDevice(joys[i]).getName()
-						.contains("NVIDIA Corporation NVIDIA Controller")) {
-					map[playerNum] = new int[] {
-							OuyaController.BUTTON_O, key_CONT_A,
-							OuyaController.BUTTON_A, key_CONT_B,
-							OuyaController.BUTTON_Y, key_CONT_Y,
-							OuyaController.BUTTON_U, key_CONT_X,
-
-							OuyaController.BUTTON_DPAD_UP, key_CONT_DPAD_UP,
-							OuyaController.BUTTON_DPAD_DOWN,
-							key_CONT_DPAD_DOWN,
-							OuyaController.BUTTON_DPAD_LEFT,
-							key_CONT_DPAD_LEFT,
-							OuyaController.BUTTON_DPAD_RIGHT,
-							key_CONT_DPAD_RIGHT,
-
-							OuyaController.BUTTON_MENU, key_CONT_START,
-							OuyaController.BUTTON_R1, key_CONT_START };
-					nVidia[playerNum] = true;
-
-					globalLS_X[playerNum] = previousLS_X[playerNum] = 0.0f;
-					globalLS_Y[playerNum] = previousLS_Y[playerNum] = 0.0f;
-				} else if (!moga.isActive) { // Ouya controller
-					map[playerNum] = new int[] {
-							OuyaController.BUTTON_O, key_CONT_A,
-							OuyaController.BUTTON_A, key_CONT_B,
-							OuyaController.BUTTON_Y, key_CONT_Y,
-							OuyaController.BUTTON_U, key_CONT_X,
-
-							OuyaController.BUTTON_DPAD_UP, key_CONT_DPAD_UP,
-							OuyaController.BUTTON_DPAD_DOWN,
-							key_CONT_DPAD_DOWN,
-							OuyaController.BUTTON_DPAD_LEFT,
-							key_CONT_DPAD_LEFT,
-							OuyaController.BUTTON_DPAD_RIGHT,
-							key_CONT_DPAD_RIGHT,
-
-							OuyaController.BUTTON_MENU, key_CONT_START,
-							OuyaController.BUTTON_R1, key_CONT_START };
+			int joys[] = InputDevice.getDeviceIds();
+			for (int i = 0; i < joys.length; i++) {
+				String descriptor = null;
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+					descriptor = InputDevice.getDevice(joys[i]).getDescriptor();
+				} else {
+					descriptor = InputDevice.getDevice(joys[i]).getName();
 				}
+				Log.d("reidc", "InputDevice ID: " + joys[i]);
+				Log.d("reidc",
+						"InputDevice Name: "
+								+ InputDevice.getDevice(joys[i]).getName());
+				Log.d("reidc", "InputDevice Descriptor: " + descriptor);
+				deviceId_deviceDescriptor.put(joys[i], descriptor);
+			}
+
+			for (int i = 0; i < joys.length; i++) {
+				Integer playerNum = deviceDescriptor_PlayerNum
+						.get(deviceId_deviceDescriptor.get(joys[i]));
+
+				if (playerNum != null) {
+
+					if (InputDevice.getDevice(joys[i]).getName()
+							.equals("Sony PLAYSTATION(R)3 Controller")) {
+						map[playerNum] = new int[] { OuyaController.BUTTON_Y,
+								key_CONT_Y, OuyaController.BUTTON_U,
+								key_CONT_X, OuyaController.BUTTON_O,
+								key_CONT_A, OuyaController.BUTTON_A,
+								key_CONT_B,
+
+								OuyaController.BUTTON_DPAD_UP,
+								key_CONT_DPAD_UP,
+								OuyaController.BUTTON_DPAD_DOWN,
+								key_CONT_DPAD_DOWN,
+								OuyaController.BUTTON_DPAD_LEFT,
+								key_CONT_DPAD_LEFT,
+								OuyaController.BUTTON_DPAD_RIGHT,
+								key_CONT_DPAD_RIGHT,
+
+								OuyaController.BUTTON_MENU, key_CONT_START,
+								OuyaController.BUTTON_R1, key_CONT_START
+
+						};
+					} else if (InputDevice.getDevice(joys[i]).getName()
+							.equals("Microsoft X-Box 360 pad")) {
+						map[playerNum] = new int[] { OuyaController.BUTTON_O,
+								key_CONT_A, OuyaController.BUTTON_A,
+								key_CONT_B, OuyaController.BUTTON_Y,
+								key_CONT_Y, OuyaController.BUTTON_U,
+								key_CONT_X,
+
+								OuyaController.BUTTON_DPAD_UP,
+								key_CONT_DPAD_UP,
+								OuyaController.BUTTON_DPAD_DOWN,
+								key_CONT_DPAD_DOWN,
+								OuyaController.BUTTON_DPAD_LEFT,
+								key_CONT_DPAD_LEFT,
+								OuyaController.BUTTON_DPAD_RIGHT,
+								key_CONT_DPAD_RIGHT,
+
+								OuyaController.BUTTON_MENU, key_CONT_START,
+								OuyaController.BUTTON_R1, key_CONT_START };
+
+						xbox[playerNum] = true;
+
+						globalLS_X[playerNum] = previousLS_X[playerNum] = 0.0f;
+						globalLS_Y[playerNum] = previousLS_Y[playerNum] = 0.0f;
+					} else if (InputDevice.getDevice(joys[i]).getName()
+							.contains("NVIDIA Corporation NVIDIA Controller")) {
+						map[playerNum] = new int[] { OuyaController.BUTTON_O,
+								key_CONT_A, OuyaController.BUTTON_A,
+								key_CONT_B, OuyaController.BUTTON_Y,
+								key_CONT_Y, OuyaController.BUTTON_U,
+								key_CONT_X,
+
+								OuyaController.BUTTON_DPAD_UP,
+								key_CONT_DPAD_UP,
+								OuyaController.BUTTON_DPAD_DOWN,
+								key_CONT_DPAD_DOWN,
+								OuyaController.BUTTON_DPAD_LEFT,
+								key_CONT_DPAD_LEFT,
+								OuyaController.BUTTON_DPAD_RIGHT,
+								key_CONT_DPAD_RIGHT,
+
+								OuyaController.BUTTON_MENU, key_CONT_START,
+								OuyaController.BUTTON_R1, key_CONT_START };
+						nVidia[playerNum] = true;
+
+						globalLS_X[playerNum] = previousLS_X[playerNum] = 0.0f;
+						globalLS_Y[playerNum] = previousLS_Y[playerNum] = 0.0f;
+					} else if (!moga.isActive) { // Ouya controller
+						map[playerNum] = new int[] { OuyaController.BUTTON_O,
+								key_CONT_A, OuyaController.BUTTON_A,
+								key_CONT_B, OuyaController.BUTTON_Y,
+								key_CONT_Y, OuyaController.BUTTON_U,
+								key_CONT_X,
+
+								OuyaController.BUTTON_DPAD_UP,
+								key_CONT_DPAD_UP,
+								OuyaController.BUTTON_DPAD_DOWN,
+								key_CONT_DPAD_DOWN,
+								OuyaController.BUTTON_DPAD_LEFT,
+								key_CONT_DPAD_LEFT,
+								OuyaController.BUTTON_DPAD_RIGHT,
+								key_CONT_DPAD_RIGHT,
+
+								OuyaController.BUTTON_MENU, key_CONT_START,
+								OuyaController.BUTTON_R1, key_CONT_START };
+					}
+				}
+
 			}
-		
-		}
 
 		}
 
@@ -307,54 +323,93 @@ public class GL2JNIActivity extends Activity {
 				"Press the back button for a menu", Toast.LENGTH_SHORT).show();
 	}
 
+	private int getModifiedKey(int KeyCode) {
+		if (prefs.getInt("a_button", -1) == KeyCode) {
+			return OuyaController.BUTTON_O;
+		}
+		if (prefs.getInt("b_button", -1) == KeyCode) {
+			return OuyaController.BUTTON_A;
+		}
+		if (prefs.getInt("x_button", -1) == KeyCode) {
+			return OuyaController.BUTTON_U;
+		}
+		if (prefs.getInt("y_button", -1) == KeyCode) {
+			return OuyaController.BUTTON_Y;
+		}
+		if (prefs.getInt("l_button", -1) == KeyCode) {
+			return OuyaController.BUTTON_L1;
+		}
+		if (prefs.getInt("r_button", -1) == KeyCode) {
+			return OuyaController.BUTTON_R1;
+		}
+		if (prefs.getInt("dpad_left", -1) == KeyCode) {
+			return OuyaController.BUTTON_DPAD_LEFT;
+		}
+		if (prefs.getInt("dpad_right", -1) == KeyCode) {
+			return OuyaController.BUTTON_DPAD_RIGHT;
+		}
+		if (prefs.getInt("dpad_up", -1) == KeyCode) {
+			return OuyaController.BUTTON_DPAD_UP;
+		}
+		if (prefs.getInt("dpad_down", -1) == KeyCode) {
+			return OuyaController.BUTTON_DPAD_DOWN;
+		}
+		if (prefs.getInt("start_button", -1) == KeyCode) {
+			return OuyaController.BUTTON_MENU;
+		}
+		return KeyCode;
+	}
+
 	@Override
 	public boolean onGenericMotionEvent(MotionEvent event) {
 		// Log.w("INPUT", event.toString() + " " + event.getSource());
 		// Get all the axis for the KeyEvent
-		
+
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
 
-		Integer playerNum = deviceDescriptor_PlayerNum.get(deviceId_deviceDescriptor.get(event.getDeviceId()));
+			Integer playerNum = deviceDescriptor_PlayerNum
+					.get(deviceId_deviceDescriptor.get(event.getDeviceId()));
 
-		if (playerNum == null)
-			return false;
+			if (playerNum == null)
+				return false;
 
-		if (!moga.isActive) {
+			if (!moga.isActive) {
 
-		// Joystick
-		if ((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
+				// Joystick
+				if ((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
 
-			// do other things with joystick
-			float LS_X = event.getAxisValue(OuyaController.AXIS_LS_X);
-			float LS_Y = event.getAxisValue(OuyaController.AXIS_LS_Y);
-			float RS_X = event.getAxisValue(OuyaController.AXIS_RS_X);
-			float RS_Y = event.getAxisValue(OuyaController.AXIS_RS_Y);
-			float L2 = event.getAxisValue(OuyaController.AXIS_L2);
-			float R2 = event.getAxisValue(OuyaController.AXIS_R2);
+					// do other things with joystick
+					float LS_X = event.getAxisValue(OuyaController.AXIS_LS_X);
+					float LS_Y = event.getAxisValue(OuyaController.AXIS_LS_Y);
+					float RS_X = event.getAxisValue(OuyaController.AXIS_RS_X);
+					float RS_Y = event.getAxisValue(OuyaController.AXIS_RS_Y);
+					float L2 = event.getAxisValue(OuyaController.AXIS_L2);
+					float R2 = event.getAxisValue(OuyaController.AXIS_R2);
+
+					if (xbox[playerNum] || nVidia[playerNum]) {
+						previousLS_X[playerNum] = globalLS_X[playerNum];
+						previousLS_Y[playerNum] = globalLS_Y[playerNum];
+						globalLS_X[playerNum] = LS_X;
+						globalLS_Y[playerNum] = LS_Y;
+					}
+
+					GL2JNIView.lt[playerNum] = (int) (L2 * 255);
+					GL2JNIView.rt[playerNum] = (int) (R2 * 255);
+
+					GL2JNIView.jx[playerNum] = (int) (LS_X * 126);
+					GL2JNIView.jy[playerNum] = (int) (LS_Y * 126);
+				}
 
-			if (xbox[playerNum] || nVidia[playerNum]) {
-				previousLS_X[playerNum] = globalLS_X[playerNum];
-				previousLS_Y[playerNum] = globalLS_Y[playerNum];
-				globalLS_X[playerNum] = LS_X;
-				globalLS_Y[playerNum] = LS_Y;
 			}
 
-			GL2JNIView.lt[playerNum] = (int) (L2 * 255);
-			GL2JNIView.rt[playerNum] = (int) (R2 * 255);
-
-			GL2JNIView.jx[playerNum] = (int) (LS_X * 126);
-			GL2JNIView.jy[playerNum] = (int) (LS_Y * 126);
-		}
-
-		}
-		
-		if ((xbox[playerNum] || nVidia[playerNum]) && ((globalLS_X[playerNum] == previousLS_X[playerNum] && globalLS_Y[playerNum] == previousLS_Y[playerNum])
-		 || (previousLS_X[playerNum] == 0.0f && previousLS_Y[playerNum] == 0.0f)))
-			// Only handle Left Stick on an Xbox 360 controller if there was some actual motion on the stick,
-			// so otherwise the event can be handled as a DPAD event
-			return false;
-		else
-			return true;
+			if ((xbox[playerNum] || nVidia[playerNum])
+					&& ((globalLS_X[playerNum] == previousLS_X[playerNum] && globalLS_Y[playerNum] == previousLS_Y[playerNum]) || (previousLS_X[playerNum] == 0.0f && previousLS_Y[playerNum] == 0.0f)))
+				// Only handle Left Stick on an Xbox 360 controller if there was
+				// some actual motion on the stick,
+				// so otherwise the event can be handled as a DPAD event
+				return false;
+			else
+				return true;
 
 		} else {
 			return false;
@@ -362,15 +417,15 @@ public class GL2JNIActivity extends Activity {
 
 	}
 
-	private static final int key_CONT_B 			= 0x0002;
-	private static final int key_CONT_A 			= 0x0004;
-	private static final int key_CONT_START 		= 0x0008;
-	private static final int key_CONT_DPAD_UP 		= 0x0010;
-	private static final int key_CONT_DPAD_DOWN 	= 0x0020;
-	private static final int key_CONT_DPAD_LEFT 	= 0x0040;
-	private static final int key_CONT_DPAD_RIGHT 	= 0x0080;
-	private static final int key_CONT_Y 			= 0x0200;
-	private static final int key_CONT_X 			= 0x0400;
+	private static final int key_CONT_B = 0x0002;
+	private static final int key_CONT_A = 0x0004;
+	private static final int key_CONT_START = 0x0008;
+	private static final int key_CONT_DPAD_UP = 0x0010;
+	private static final int key_CONT_DPAD_DOWN = 0x0020;
+	private static final int key_CONT_DPAD_LEFT = 0x0040;
+	private static final int key_CONT_DPAD_RIGHT = 0x0080;
+	private static final int key_CONT_Y = 0x0200;
+	private static final int key_CONT_X = 0x0400;
 
 	// TODO: Controller mapping in options. Trunk has Ouya layout. This is a DS3
 	// layout.
@@ -407,48 +462,51 @@ public class GL2JNIActivity extends Activity {
 	 */
 
 	boolean handle_key(Integer playerNum, int kc, boolean down) {
-	    if (playerNum == null)
-		return false;
+		if (playerNum == null)
+			return false;
 
-	    if (!moga.isActive) {
+		if (!moga.isActive) {
 
-		boolean rav = false;
-		for (int i = 0; i < map[playerNum].length; i += 2) {
-			if (map[playerNum][i + 0] == kc) {
-				if (down)
-					GL2JNIView.kcode_raw[playerNum] &= ~map[playerNum][i + 1];
-				else
-					GL2JNIView.kcode_raw[playerNum] |= map[playerNum][i + 1];
+			boolean rav = false;
+			for (int i = 0; i < map[playerNum].length; i += 2) {
+				if (map[playerNum][i + 0] == kc) {
+					if (down)
+						GL2JNIView.kcode_raw[playerNum] &= ~map[playerNum][i + 1];
+					else
+						GL2JNIView.kcode_raw[playerNum] |= map[playerNum][i + 1];
 
-				rav = true;
-				break;
+					rav = true;
+					break;
+				}
 			}
-		}
 
-		return rav;
+			return rav;
 
 		} else {
-		    return true;
+			return true;
 		}
 	}
 
 	public boolean onKeyUp(int keyCode, KeyEvent event) {
-		Integer playerNum = deviceDescriptor_PlayerNum.get(deviceId_deviceDescriptor.get(event.getDeviceId()));
+		Integer playerNum = deviceDescriptor_PlayerNum
+				.get(deviceId_deviceDescriptor.get(event.getDeviceId()));
 
-		return handle_key(playerNum, keyCode, false) || super.onKeyUp(keyCode, event);
+		return handle_key(playerNum, getModifiedKey(keyCode), false)
+				|| super.onKeyUp(getModifiedKey(keyCode), event);
 	}
 
 	public boolean onKeyDown(int keyCode, KeyEvent event) {
-		Integer playerNum = deviceDescriptor_PlayerNum.get(deviceId_deviceDescriptor.get(event.getDeviceId()));
+		Integer playerNum = deviceDescriptor_PlayerNum
+				.get(deviceId_deviceDescriptor.get(event.getDeviceId()));
 
-		if (handle_key(playerNum, keyCode, true)) {
-			if(playerNum == 0)
+		if (handle_key(playerNum, getModifiedKey(keyCode), true)) {
+			if (playerNum == 0)
 				JNIdc.hide_osd();
 			return true;
 		}
 
-		if (keyCode == KeyEvent.KEYCODE_MENU
-				|| keyCode == KeyEvent.KEYCODE_BACK) {
+		if (getModifiedKey(keyCode) == KeyEvent.KEYCODE_MENU
+				|| getModifiedKey(keyCode) == KeyEvent.KEYCODE_BACK) {
 			if (!popUp.isShowing()) {
 				popUp.showAtLocation(mView, Gravity.BOTTOM, 0, 0);
 				popUp.update(LayoutParams.WRAP_CONTENT,
@@ -460,7 +518,7 @@ public class GL2JNIActivity extends Activity {
 
 			return true;
 		} else
-			return super.onKeyDown(keyCode, event);
+			return super.onKeyDown(getModifiedKey(keyCode), event);
 	}
 
 	@Override
diff --git a/shell/android/src/com/reicast/emulator/InputFragment.java b/shell/android/src/com/reicast/emulator/InputFragment.java
index e9bff6b47..0fce8a8e0 100644
--- a/shell/android/src/com/reicast/emulator/InputFragment.java
+++ b/shell/android/src/com/reicast/emulator/InputFragment.java
@@ -153,6 +153,22 @@ public class InputFragment extends Fragment {
 		}
 
 		updateVibration();
+		
+		Button buttonKeycodeEditor = (Button) getView().findViewById(
+				R.id.buttonKeycodeEditor);
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
+			buttonKeycodeEditor.setOnClickListener(new View.OnClickListener() {
+				public void onClick(View v) {
+					InputModFragment inputModFrag = new InputModFragment();
+					getActivity().getSupportFragmentManager()
+							.beginTransaction()
+							.replace(R.id.fragment_container, inputModFrag,
+									"INPUT_MOD_FRAG").addToBackStack(null).commit();
+				}
+			});
+		} else {
+			buttonKeycodeEditor.setVisibility(View.GONE);
+		}
 	}
 
 	private void updateVibration() {
@@ -172,7 +188,7 @@ public class InputFragment extends Fragment {
 			InputDevice dev = InputDevice.getDevice(devideId);
 			String descriptor = null;
 			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-			descriptor = dev.getDescriptor();
+				descriptor = dev.getDescriptor();
 			} else {
 				descriptor = dev.getName();
 			}
diff --git a/shell/android/src/com/reicast/emulator/InputModFragment.java b/shell/android/src/com/reicast/emulator/InputModFragment.java
new file mode 100644
index 000000000..bb9ee323b
--- /dev/null
+++ b/shell/android/src/com/reicast/emulator/InputModFragment.java
@@ -0,0 +1,239 @@
+package com.reicast.emulator;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.v4.app.Fragment;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+public class InputModFragment extends Fragment {
+
+	private Activity parentActivity;
+	private SharedPreferences mPrefs;
+
+	// Container Activity must implement this interface
+	public interface OnClickListener {
+		public void onMainBrowseSelected(String path_entry, boolean games);
+	}
+
+	@Override
+	public View onCreateView(LayoutInflater inflater, ViewGroup container,
+			Bundle savedInstanceState) {
+		// Inflate the layout for this fragment
+		return inflater.inflate(R.layout.input_mod_fragment, container, false);
+	}
+
+	@Override
+	public void onViewCreated(View view, Bundle savedInstanceState) {
+		parentActivity = getActivity();
+
+		mPrefs = PreferenceManager
+				.getDefaultSharedPreferences(parentActivity);
+		
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
+
+			final TextView a_button_text = (TextView) getView()
+					.findViewById(R.id.a_button_key);
+			getKeyCode("a_button", a_button_text);
+			Button a_button = (Button) getView()
+					.findViewById(R.id.a_button_edit);
+			a_button.setOnClickListener(new View.OnClickListener() {
+	    			public void onClick(View v) {
+	    				mapKeyCode("a_button", a_button_text);
+	    			} 
+			});
+			
+			final TextView b_button_text = (TextView) getView()
+					.findViewById(R.id.b_button_key);
+			getKeyCode("b_button", b_button_text);
+			Button b_button = (Button) getView()
+					.findViewById(R.id.b_button_edit);
+			b_button.setOnClickListener(new View.OnClickListener() {
+	    			public void onClick(View v) {
+	    				mapKeyCode("b_button", b_button_text);
+	    			} 
+			});
+			
+			final TextView x_button_text = (TextView) getView()
+					.findViewById(R.id.x_button_key);
+			getKeyCode("x_button", x_button_text);
+			Button x_button = (Button) getView()
+					.findViewById(R.id.x_button_edit);
+			x_button.setOnClickListener(new View.OnClickListener() {
+	    			public void onClick(View v) {
+	    				mapKeyCode("x_button", x_button_text);
+	    			} 
+			});
+			
+			final TextView y_button_text = (TextView) getView()
+					.findViewById(R.id.y_button_key);
+			getKeyCode("y_button", y_button_text);
+			Button y_button = (Button) getView()
+					.findViewById(R.id.y_button_edit);
+			y_button.setOnClickListener(new View.OnClickListener() {
+	    			public void onClick(View v) {
+	    				mapKeyCode("y_button", y_button_text);
+	    			} 
+			});
+
+			final TextView l_button_text = (TextView) getView()
+					.findViewById(R.id.l_button_key);
+			getKeyCode("l_button", l_button_text);
+			Button l_button = (Button) getView()
+					.findViewById(R.id.l_button_edit);
+			l_button.setOnClickListener(new View.OnClickListener() {
+	    			public void onClick(View v) {
+	    				mapKeyCode("l_button", l_button_text);
+	    			} 
+			});
+
+			final TextView r_button_text = (TextView) getView()
+					.findViewById(R.id.r_button_key);
+			getKeyCode("r_button", r_button_text);
+			Button r_button = (Button) getView()
+					.findViewById(R.id.r_button_edit);
+			r_button.setOnClickListener(new View.OnClickListener() {
+	    			public void onClick(View v) {
+	    				mapKeyCode("r_button", r_button_text);
+	    			} 
+			});
+
+			final TextView joystick_text = (TextView) getView()
+					.findViewById(R.id.joystick_key);
+			getKeyCode("joystick", joystick_text);
+			Button joystick = (Button) getView()
+					.findViewById(R.id.joystick_edit);
+			joystick.setOnClickListener(new View.OnClickListener() {
+	    			public void onClick(View v) {
+	    				mapKeyCode("joystick", joystick_text);
+	    			} 
+			});
+
+			final TextView dpad_left_text = (TextView) getView()
+					.findViewById(R.id.dpad_left_key);
+			getKeyCode("dpad_left", dpad_left_text);
+			Button dpad_left = (Button) getView()
+					.findViewById(R.id.dpad_left_edit);
+			dpad_left.setOnClickListener(new View.OnClickListener() {
+	    			public void onClick(View v) {
+	    				mapKeyCode("dpad_left", dpad_left_text);
+	    			} 
+			});
+			
+			final TextView dpad_right_text = (TextView) getView()
+					.findViewById(R.id.dpad_right_key);
+			getKeyCode("dpad_right", dpad_right_text);
+			Button dpad_right = (Button) getView()
+					.findViewById(R.id.dpad_right_edit);
+			dpad_right.setOnClickListener(new View.OnClickListener() {
+	    			public void onClick(View v) {
+	    				mapKeyCode("dpad_right", dpad_right_text);
+	    			} 
+			});
+			
+			final TextView dpad_up_text = (TextView) getView()
+					.findViewById(R.id.dpad_up_key);
+			getKeyCode("dpad_up", dpad_up_text);
+			Button dpad_up = (Button) getView()
+					.findViewById(R.id.dpad_up_edit);
+			dpad_up.setOnClickListener(new View.OnClickListener() {
+	    			public void onClick(View v) {
+	    				mapKeyCode("dpad_up", dpad_up_text);
+	    			} 
+			});
+			
+			final TextView dpad_down_text = (TextView) getView()
+					.findViewById(R.id.dpad_down_key);
+			getKeyCode("dpad_down", dpad_down_text);
+			Button dpad_down = (Button) getView()
+					.findViewById(R.id.dpad_down_edit);
+			dpad_down.setOnClickListener(new View.OnClickListener() {
+	    			public void onClick(View v) {
+	    				mapKeyCode("dpad_down", dpad_down_text);
+	    			} 
+			});
+			
+			final TextView start_button_text = (TextView) getView()
+					.findViewById(R.id.start_button_key);
+			getKeyCode("start_button", start_button_text);
+			Button start_button = (Button) getView()
+					.findViewById(R.id.start_button_edit);
+			start_button.setOnClickListener(new View.OnClickListener() {
+	    			public void onClick(View v) {
+	    				mapKeyCode("start_button", start_button_text);
+	    			} 
+			});
+		
+		} else {
+
+			// Notify the user they got here by mistake
+
+		}
+	}
+	
+	private void getKeyCode(final String button, final TextView output) {
+		int keyCode = mPrefs.getInt(button, -1);
+		if (keyCode != -1) {
+			String label = output.getText().toString();
+			if (label.contains(":")) {
+				label = label.substring(0, label.indexOf(":"));
+			}
+			output.setText(label + ": " + String.valueOf(keyCode));
+		}
+	}
+	
+	private void mapKeyCode(final String button, final TextView output) {
+	
+		AlertDialog.Builder builder = new AlertDialog.Builder(parentActivity);
+		builder.setTitle(getString(R.string.map_keycode_title));
+		builder.setMessage(getString(R.string.map_keycode_message, button.replace("_", " ")));
+		builder.setNegativeButton("Cancel",
+				new DialogInterface.OnClickListener() {
+					public void onClick(DialogInterface dialog, int which) {
+						dialog.dismiss();
+					}
+				});
+		builder.setOnKeyListener(new Dialog.OnKeyListener() {
+			public boolean onKey(DialogInterface dialog, int keyCode,
+					KeyEvent event) {
+				int value = mapButton(keyCode, event, button);
+				dialog.dismiss();
+				if (value != -1) {
+					String label = output.getText().toString();
+					if (label.contains(":")) {
+						label = label.substring(0, label.indexOf(":"));
+					}
+					output.setText(label + ": " + String.valueOf(value));
+					return true;
+				} else {
+					return false;
+				}
+				
+			}
+		});
+		builder.create();
+		builder.show();
+	}
+
+	private int mapButton(int keyCode, KeyEvent event, String button) {
+		if (keyCode == KeyEvent.KEYCODE_MENU
+				|| keyCode == KeyEvent.KEYCODE_BACK
+				|| keyCode == KeyEvent.KEYCODE_VOLUME_UP
+				|| keyCode == KeyEvent.KEYCODE_VOLUME_DOWN)
+			return -1;
+
+		mPrefs.edit().putInt(button, keyCode).commit();
+
+		return keyCode;
+	}
+}
diff --git a/shell/android/src/com/reicast/emulator/MOGAInput.java b/shell/android/src/com/reicast/emulator/MOGAInput.java
index 9cf5d0de3..f1a904db9 100644
--- a/shell/android/src/com/reicast/emulator/MOGAInput.java
+++ b/shell/android/src/com/reicast/emulator/MOGAInput.java
@@ -3,8 +3,11 @@ package com.reicast.emulator;
 
 /******************************************************************************/
 
+import tv.ouya.console.api.OuyaController;
 import android.app.Activity;
+import android.content.SharedPreferences;
 import android.os.Handler;
+import android.preference.PreferenceManager;
 import android.widget.Toast;
 
 import com.bda.controller.Controller;
@@ -20,6 +23,8 @@ import com.bda.controller.StateEvent;
 */
 public class MOGAInput
 {
+	private SharedPreferences prefs;
+
 	static final int DELAY = 1000 / 50; // 50 Hz
 	
 	static final int ACTION_CONNECTED = Controller.ACTION_CONNECTED;
@@ -93,6 +98,9 @@ public class MOGAInput
 	protected void onCreate(Activity act)
 	{
 		this.act = act;
+		
+		prefs = PreferenceManager
+				.getDefaultSharedPreferences(act.getApplicationContext());
 
 		mController = Controller.getInstance(act);
 		mController.init();
@@ -136,6 +144,43 @@ public class MOGAInput
 		}
 		*/
 	}
+	
+	private int getModifiedKey(int KeyCode) {
+		if (prefs.getInt("a_button", -1) == KeyCode) {
+			return KeyEvent.KEYCODE_BUTTON_A;
+		}
+		if (prefs.getInt("b_button", -1) == KeyCode) {
+			return KeyEvent.KEYCODE_BUTTON_B;
+		}
+		if (prefs.getInt("x_button", -1) == KeyCode) {
+			return KeyEvent.KEYCODE_BUTTON_X;
+		}
+		if (prefs.getInt("y_button", -1) == KeyCode) {
+			return KeyEvent.KEYCODE_BUTTON_Y;
+		}
+		if (prefs.getInt("l_button", -1) == KeyCode) {
+			return KeyEvent.KEYCODE_BUTTON_L2;
+		}
+		if (prefs.getInt("r_button", -1) == KeyCode) {
+			return KeyEvent.KEYCODE_BUTTON_R2;
+		}
+		if (prefs.getInt("dpad_left", -1) == KeyCode) {
+			return KeyEvent.KEYCODE_DPAD_LEFT;
+		}
+		if (prefs.getInt("dpad_right", -1) == KeyCode) {
+			return KeyEvent.KEYCODE_DPAD_RIGHT;
+		}
+		if (prefs.getInt("dpad_up", -1) == KeyCode) {
+			return KeyEvent.KEYCODE_DPAD_UP;
+		}
+		if (prefs.getInt("dpad_down", -1) == KeyCode) {
+			return KeyEvent.KEYCODE_DPAD_DOWN;
+		}
+		if (prefs.getInt("start_button", -1) == KeyCode) {
+			return KeyEvent.KEYCODE_BUTTON_START;
+		}
+		return KeyCode;
+	}
 
 	class ExampleControllerListener implements ControllerListener
 	{
@@ -150,7 +195,7 @@ public class MOGAInput
 				JNIdc.hide_osd();
 
 			for (int i = 0; i < map.length; i += 2) {
-				if (map[i + 0] == event.getKeyCode()) {
+				if (map[i + 0] == getModifiedKey(event.getKeyCode())) {
 					if (event.getAction() == 0) //FIXME to const
 						GL2JNIView.kcode_raw[playerNum] &= ~map[i + 1];
 					else

From f79cb1ecb7f9e0f08c630b1ac31a011ec5771024 Mon Sep 17 00:00:00 2001
From: TwistedUmbrella <twistedumbrella@gmail.com>
Date: Thu, 23 Jan 2014 01:22:01 -0500
Subject: [PATCH 2/7] Rewrite the key assignment function to override default
 key

---
 .../android/res/layout/input_mod_fragment.xml |  26 +++
 shell/android/res/values/strings.xml          |   1 +
 .../com/reicast/emulator/GL2JNIActivity.java  | 171 +++++++-----------
 .../reicast/emulator/InputModFragment.java    |  28 ++-
 .../src/com/reicast/emulator/MOGAInput.java   |  77 +++-----
 5 files changed, 152 insertions(+), 151 deletions(-)

diff --git a/shell/android/res/layout/input_mod_fragment.xml b/shell/android/res/layout/input_mod_fragment.xml
index c8b2342ac..b76fd3ee5 100644
--- a/shell/android/res/layout/input_mod_fragment.xml
+++ b/shell/android/res/layout/input_mod_fragment.xml
@@ -13,6 +13,32 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:stretchColumns="*" >
+        
+        <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/modified_layout" />
+
+            <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/switchModifiedLayoutEnabled"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+        </TableRow>
 
         <TableRow android:gravity="center_vertical" >
 
diff --git a/shell/android/res/values/strings.xml b/shell/android/res/values/strings.xml
index 36bd05bef..dc302699e 100644
--- a/shell/android/res/values/strings.xml
+++ b/shell/android/res/values/strings.xml
@@ -42,6 +42,7 @@
     <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>
+    <string name="modified_layout">Enable Custom Key Layout</string>
     
     <string name="menu_edit_keycodes">Edit Key Bindings</string>
     <string name="map_keycode_title">Modify Controller</string>
diff --git a/shell/android/src/com/reicast/emulator/GL2JNIActivity.java b/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
index 23deb85fe..e5d7a1c3e 100644
--- a/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
+++ b/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
@@ -217,46 +217,41 @@ public class GL2JNIActivity extends Activity {
 
 				if (playerNum != null) {
 
-					if (InputDevice.getDevice(joys[i]).getName()
+					if (prefs.getBoolean("modified_key_layout", false)) {
+						map[playerNum] = setModifiedKeys();
+					} else if (InputDevice.getDevice(joys[i]).getName()
 							.equals("Sony PLAYSTATION(R)3 Controller")) {
-						map[playerNum] = new int[] { OuyaController.BUTTON_Y,
-								key_CONT_Y, OuyaController.BUTTON_U,
-								key_CONT_X, OuyaController.BUTTON_O,
-								key_CONT_A, OuyaController.BUTTON_A,
-								key_CONT_B,
+						map[playerNum] = new int[] {
+							OuyaController.BUTTON_Y, key_CONT_Y,
+							OuyaController.BUTTON_U, key_CONT_X,
+							OuyaController.BUTTON_O, key_CONT_A,
+							OuyaController.BUTTON_A, key_CONT_B,
 
-								OuyaController.BUTTON_DPAD_UP,
-								key_CONT_DPAD_UP,
-								OuyaController.BUTTON_DPAD_DOWN,
-								key_CONT_DPAD_DOWN,
-								OuyaController.BUTTON_DPAD_LEFT,
-								key_CONT_DPAD_LEFT,
-								OuyaController.BUTTON_DPAD_RIGHT,
-								key_CONT_DPAD_RIGHT,
+							OuyaController.BUTTON_DPAD_UP, key_CONT_DPAD_UP,
+							OuyaController.BUTTON_DPAD_DOWN, key_CONT_DPAD_DOWN,
+							OuyaController.BUTTON_DPAD_LEFT, key_CONT_DPAD_LEFT,
+							OuyaController.BUTTON_DPAD_RIGHT, key_CONT_DPAD_RIGHT,
 
-								OuyaController.BUTTON_MENU, key_CONT_START,
-								OuyaController.BUTTON_R1, key_CONT_START
+							OuyaController.BUTTON_MENU, key_CONT_START,
+							OuyaController.BUTTON_R1, key_CONT_START
 
 						};
 					} else if (InputDevice.getDevice(joys[i]).getName()
 							.equals("Microsoft X-Box 360 pad")) {
-						map[playerNum] = new int[] { OuyaController.BUTTON_O,
-								key_CONT_A, OuyaController.BUTTON_A,
-								key_CONT_B, OuyaController.BUTTON_Y,
-								key_CONT_Y, OuyaController.BUTTON_U,
-								key_CONT_X,
+						map[playerNum] = new int[] {
+							OuyaController.BUTTON_O, key_CONT_A,
+							OuyaController.BUTTON_A, key_CONT_B,
+							OuyaController.BUTTON_Y, key_CONT_Y,
+							OuyaController.BUTTON_U, key_CONT_X,
 
-								OuyaController.BUTTON_DPAD_UP,
-								key_CONT_DPAD_UP,
-								OuyaController.BUTTON_DPAD_DOWN,
-								key_CONT_DPAD_DOWN,
-								OuyaController.BUTTON_DPAD_LEFT,
-								key_CONT_DPAD_LEFT,
-								OuyaController.BUTTON_DPAD_RIGHT,
-								key_CONT_DPAD_RIGHT,
+							OuyaController.BUTTON_DPAD_UP, key_CONT_DPAD_UP,
+							OuyaController.BUTTON_DPAD_DOWN, key_CONT_DPAD_DOWN,
+							OuyaController.BUTTON_DPAD_LEFT, key_CONT_DPAD_LEFT,
+							OuyaController.BUTTON_DPAD_RIGHT, key_CONT_DPAD_RIGHT,
 
-								OuyaController.BUTTON_MENU, key_CONT_START,
-								OuyaController.BUTTON_R1, key_CONT_START };
+							OuyaController.BUTTON_MENU, key_CONT_START,
+							OuyaController.BUTTON_R1, key_CONT_START
+						};
 
 						xbox[playerNum] = true;
 
@@ -264,45 +259,38 @@ public class GL2JNIActivity extends Activity {
 						globalLS_Y[playerNum] = previousLS_Y[playerNum] = 0.0f;
 					} else if (InputDevice.getDevice(joys[i]).getName()
 							.contains("NVIDIA Corporation NVIDIA Controller")) {
-						map[playerNum] = new int[] { OuyaController.BUTTON_O,
-								key_CONT_A, OuyaController.BUTTON_A,
-								key_CONT_B, OuyaController.BUTTON_Y,
-								key_CONT_Y, OuyaController.BUTTON_U,
-								key_CONT_X,
+						map[playerNum] = new int[] { 
+							OuyaController.BUTTON_O, key_CONT_A,
+							OuyaController.BUTTON_A, key_CONT_B,
+							OuyaController.BUTTON_Y, key_CONT_Y,
+							OuyaController.BUTTON_U, key_CONT_X,
 
-								OuyaController.BUTTON_DPAD_UP,
-								key_CONT_DPAD_UP,
-								OuyaController.BUTTON_DPAD_DOWN,
-								key_CONT_DPAD_DOWN,
-								OuyaController.BUTTON_DPAD_LEFT,
-								key_CONT_DPAD_LEFT,
-								OuyaController.BUTTON_DPAD_RIGHT,
-								key_CONT_DPAD_RIGHT,
+							OuyaController.BUTTON_DPAD_UP, key_CONT_DPAD_UP,
+							OuyaController.BUTTON_DPAD_DOWN, key_CONT_DPAD_DOWN,
+							OuyaController.BUTTON_DPAD_LEFT, key_CONT_DPAD_LEFT,
+							OuyaController.BUTTON_DPAD_RIGHT, key_CONT_DPAD_RIGHT,
 
-								OuyaController.BUTTON_MENU, key_CONT_START,
-								OuyaController.BUTTON_R1, key_CONT_START };
+							OuyaController.BUTTON_MENU, key_CONT_START,
+							OuyaController.BUTTON_R1, key_CONT_START
+						};
 						nVidia[playerNum] = true;
 
 						globalLS_X[playerNum] = previousLS_X[playerNum] = 0.0f;
 						globalLS_Y[playerNum] = previousLS_Y[playerNum] = 0.0f;
 					} else if (!moga.isActive) { // Ouya controller
-						map[playerNum] = new int[] { OuyaController.BUTTON_O,
-								key_CONT_A, OuyaController.BUTTON_A,
-								key_CONT_B, OuyaController.BUTTON_Y,
-								key_CONT_Y, OuyaController.BUTTON_U,
-								key_CONT_X,
+						map[playerNum] = new int[] {
+							OuyaController.BUTTON_O, key_CONT_A,
+							OuyaController.BUTTON_A, key_CONT_B,
+							OuyaController.BUTTON_Y, key_CONT_Y,
+							OuyaController.BUTTON_U, key_CONT_X,
 
-								OuyaController.BUTTON_DPAD_UP,
-								key_CONT_DPAD_UP,
-								OuyaController.BUTTON_DPAD_DOWN,
-								key_CONT_DPAD_DOWN,
-								OuyaController.BUTTON_DPAD_LEFT,
-								key_CONT_DPAD_LEFT,
-								OuyaController.BUTTON_DPAD_RIGHT,
-								key_CONT_DPAD_RIGHT,
+							OuyaController.BUTTON_DPAD_UP, key_CONT_DPAD_UP,
+							OuyaController.BUTTON_DPAD_DOWN, key_CONT_DPAD_DOWN,
+							OuyaController.BUTTON_DPAD_LEFT, key_CONT_DPAD_LEFT,
+							OuyaController.BUTTON_DPAD_RIGHT, key_CONT_DPAD_RIGHT,
 
-								OuyaController.BUTTON_MENU, key_CONT_START,
-								OuyaController.BUTTON_R1, key_CONT_START };
+							OuyaController.BUTTON_MENU, key_CONT_START,
+							OuyaController.BUTTON_R1, key_CONT_START };
 					}
 				}
 
@@ -322,42 +310,21 @@ public class GL2JNIActivity extends Activity {
 		Toast.makeText(getApplicationContext(),
 				"Press the back button for a menu", Toast.LENGTH_SHORT).show();
 	}
+	
+	private int[] setModifiedKeys() {
+		return new int[] { 
+			prefs.getInt("a_button", OuyaController.BUTTON_O), key_CONT_A, 
+			prefs.getInt("b_button", OuyaController.BUTTON_A), key_CONT_B,
+			prefs.getInt("y_button", OuyaController.BUTTON_Y), key_CONT_Y,
+			prefs.getInt("x_button", OuyaController.BUTTON_U), key_CONT_X,
 
-	private int getModifiedKey(int KeyCode) {
-		if (prefs.getInt("a_button", -1) == KeyCode) {
-			return OuyaController.BUTTON_O;
-		}
-		if (prefs.getInt("b_button", -1) == KeyCode) {
-			return OuyaController.BUTTON_A;
-		}
-		if (prefs.getInt("x_button", -1) == KeyCode) {
-			return OuyaController.BUTTON_U;
-		}
-		if (prefs.getInt("y_button", -1) == KeyCode) {
-			return OuyaController.BUTTON_Y;
-		}
-		if (prefs.getInt("l_button", -1) == KeyCode) {
-			return OuyaController.BUTTON_L1;
-		}
-		if (prefs.getInt("r_button", -1) == KeyCode) {
-			return OuyaController.BUTTON_R1;
-		}
-		if (prefs.getInt("dpad_left", -1) == KeyCode) {
-			return OuyaController.BUTTON_DPAD_LEFT;
-		}
-		if (prefs.getInt("dpad_right", -1) == KeyCode) {
-			return OuyaController.BUTTON_DPAD_RIGHT;
-		}
-		if (prefs.getInt("dpad_up", -1) == KeyCode) {
-			return OuyaController.BUTTON_DPAD_UP;
-		}
-		if (prefs.getInt("dpad_down", -1) == KeyCode) {
-			return OuyaController.BUTTON_DPAD_DOWN;
-		}
-		if (prefs.getInt("start_button", -1) == KeyCode) {
-			return OuyaController.BUTTON_MENU;
-		}
-		return KeyCode;
+			prefs.getInt("dpad_up", OuyaController.BUTTON_DPAD_UP), key_CONT_DPAD_UP,
+			prefs.getInt("dpad_down", OuyaController.BUTTON_DPAD_DOWN), key_CONT_DPAD_DOWN,
+			prefs.getInt("dpad_left", OuyaController.BUTTON_DPAD_LEFT), key_CONT_DPAD_LEFT,
+			prefs.getInt("dpad_right", OuyaController.BUTTON_DPAD_RIGHT), key_CONT_DPAD_RIGHT,
+
+			prefs.getInt("start_button", OuyaController.BUTTON_MENU), key_CONT_START,
+		};
 	}
 
 	@Override
@@ -491,22 +458,22 @@ public class GL2JNIActivity extends Activity {
 		Integer playerNum = deviceDescriptor_PlayerNum
 				.get(deviceId_deviceDescriptor.get(event.getDeviceId()));
 
-		return handle_key(playerNum, getModifiedKey(keyCode), false)
-				|| super.onKeyUp(getModifiedKey(keyCode), event);
+		return handle_key(playerNum, keyCode, false)
+				|| super.onKeyUp(keyCode, event);
 	}
 
 	public boolean onKeyDown(int keyCode, KeyEvent event) {
 		Integer playerNum = deviceDescriptor_PlayerNum
 				.get(deviceId_deviceDescriptor.get(event.getDeviceId()));
 
-		if (handle_key(playerNum, getModifiedKey(keyCode), true)) {
+		if (handle_key(playerNum, keyCode, true)) {
 			if (playerNum == 0)
 				JNIdc.hide_osd();
 			return true;
 		}
 
-		if (getModifiedKey(keyCode) == KeyEvent.KEYCODE_MENU
-				|| getModifiedKey(keyCode) == KeyEvent.KEYCODE_BACK) {
+		if (keyCode == KeyEvent.KEYCODE_MENU
+				|| keyCode == KeyEvent.KEYCODE_BACK) {
 			if (!popUp.isShowing()) {
 				popUp.showAtLocation(mView, Gravity.BOTTOM, 0, 0);
 				popUp.update(LayoutParams.WRAP_CONTENT,
@@ -518,7 +485,7 @@ public class GL2JNIActivity extends Activity {
 
 			return true;
 		} else
-			return super.onKeyDown(getModifiedKey(keyCode), event);
+			return super.onKeyDown(keyCode, event);
 	}
 
 	@Override
diff --git a/shell/android/src/com/reicast/emulator/InputModFragment.java b/shell/android/src/com/reicast/emulator/InputModFragment.java
index bb9ee323b..07919d446 100644
--- a/shell/android/src/com/reicast/emulator/InputModFragment.java
+++ b/shell/android/src/com/reicast/emulator/InputModFragment.java
@@ -1,5 +1,6 @@
 package com.reicast.emulator;
 
+import de.ankri.views.Switch;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
@@ -14,12 +15,15 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.CompoundButton;
 import android.widget.TextView;
+import android.widget.CompoundButton.OnCheckedChangeListener;
 
 public class InputModFragment extends Fragment {
 
 	private Activity parentActivity;
 	private SharedPreferences mPrefs;
+	private Switch switchModifiedLayoutEnabled;
 
 	// Container Activity must implement this interface
 	public interface OnClickListener {
@@ -40,6 +44,25 @@ public class InputModFragment extends Fragment {
 		mPrefs = PreferenceManager
 				.getDefaultSharedPreferences(parentActivity);
 		
+		OnCheckedChangeListener modified_layout = new OnCheckedChangeListener() {
+			public void onCheckedChanged(CompoundButton buttonView,
+					boolean isChecked) {
+				mPrefs.edit()
+						.putBoolean("modified_key_layout", isChecked)
+						.commit();
+			}
+		};
+		switchModifiedLayoutEnabled = (Switch) getView().findViewById(
+				R.id.switchModifiedLayoutEnabled);
+		boolean layout = mPrefs.getBoolean(
+				"modified_key_layout", true);
+		if (layout) {
+			switchModifiedLayoutEnabled.setChecked(true);
+		} else {
+			switchModifiedLayoutEnabled.setChecked(false);
+		}
+		switchModifiedLayoutEnabled.setOnCheckedChangeListener(modified_layout);
+		
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
 
 			final TextView a_button_text = (TextView) getView()
@@ -118,6 +141,9 @@ public class InputModFragment extends Fragment {
 	    				mapKeyCode("joystick", joystick_text);
 	    			} 
 			});
+			joystick.setEnabled(false);
+			mPrefs.edit().remove("joystick").commit();
+			// Still needs better support for identifying the entire stick
 
 			final TextView dpad_left_text = (TextView) getView()
 					.findViewById(R.id.dpad_left_key);
@@ -176,7 +202,7 @@ public class InputModFragment extends Fragment {
 		
 		} else {
 
-			// Notify the user they got here by mistake
+			switchModifiedLayoutEnabled.setEnabled(false);
 
 		}
 	}
diff --git a/shell/android/src/com/reicast/emulator/MOGAInput.java b/shell/android/src/com/reicast/emulator/MOGAInput.java
index f1a904db9..cda68871f 100644
--- a/shell/android/src/com/reicast/emulator/MOGAInput.java
+++ b/shell/android/src/com/reicast/emulator/MOGAInput.java
@@ -47,18 +47,18 @@ public class MOGAInput
 	private static final int key_CONT_X 			= 0x0400;
 
 	int[] map = new int[] {
-						KeyEvent.KEYCODE_BUTTON_B, key_CONT_B,
-						KeyEvent.KEYCODE_BUTTON_A, key_CONT_A,
-						KeyEvent.KEYCODE_BUTTON_X, key_CONT_X,
-						KeyEvent.KEYCODE_BUTTON_Y, key_CONT_Y,
+		KeyEvent.KEYCODE_BUTTON_B, key_CONT_B,
+		KeyEvent.KEYCODE_BUTTON_A, key_CONT_A,
+		KeyEvent.KEYCODE_BUTTON_X, key_CONT_X,
+		KeyEvent.KEYCODE_BUTTON_Y, key_CONT_Y,
 
-						KeyEvent.KEYCODE_DPAD_UP, key_CONT_DPAD_UP,
-						KeyEvent.KEYCODE_DPAD_DOWN, key_CONT_DPAD_DOWN,
-						KeyEvent.KEYCODE_DPAD_LEFT, key_CONT_DPAD_LEFT,
-						KeyEvent.KEYCODE_DPAD_RIGHT, key_CONT_DPAD_RIGHT,
+		KeyEvent.KEYCODE_DPAD_UP, key_CONT_DPAD_UP,
+		KeyEvent.KEYCODE_DPAD_DOWN, key_CONT_DPAD_DOWN,
+		KeyEvent.KEYCODE_DPAD_LEFT, key_CONT_DPAD_LEFT,
+		KeyEvent.KEYCODE_DPAD_RIGHT, key_CONT_DPAD_RIGHT,
 
-						KeyEvent.KEYCODE_BUTTON_START, key_CONT_START,
-				};
+		KeyEvent.KEYCODE_BUTTON_START, key_CONT_START,
+	};
 
 	Activity act;
 	public MOGAInput()
@@ -98,9 +98,7 @@ public class MOGAInput
 	protected void onCreate(Activity act)
 	{
 		this.act = act;
-		
-		prefs = PreferenceManager
-				.getDefaultSharedPreferences(act.getApplicationContext());
+		setModifiedKeys();
 
 		mController = Controller.getInstance(act);
 		mController.init();
@@ -145,41 +143,24 @@ public class MOGAInput
 		*/
 	}
 	
-	private int getModifiedKey(int KeyCode) {
-		if (prefs.getInt("a_button", -1) == KeyCode) {
-			return KeyEvent.KEYCODE_BUTTON_A;
+	private void setModifiedKeys() {
+		prefs = PreferenceManager
+				.getDefaultSharedPreferences(act.getApplicationContext());
+		if (prefs.getBoolean("modified_key_layout", false)) {
+			map = new int[] {
+				prefs.getInt("b_button", KeyEvent.KEYCODE_BUTTON_B), key_CONT_B,
+				prefs.getInt("a_button", KeyEvent.KEYCODE_BUTTON_A), key_CONT_A,
+				prefs.getInt("x_button", KeyEvent.KEYCODE_BUTTON_X), key_CONT_X,
+				prefs.getInt("l_button", KeyEvent.KEYCODE_BUTTON_Y), key_CONT_Y,
+
+				prefs.getInt("dpad_up", KeyEvent.KEYCODE_DPAD_UP), key_CONT_DPAD_UP,
+				prefs.getInt("dpad_down", KeyEvent.KEYCODE_DPAD_DOWN), key_CONT_DPAD_DOWN,
+				prefs.getInt("dpad_left", KeyEvent.KEYCODE_DPAD_LEFT), key_CONT_DPAD_LEFT,
+				prefs.getInt("dpad_right", KeyEvent.KEYCODE_DPAD_RIGHT), key_CONT_DPAD_RIGHT,
+
+				prefs.getInt("start_button", KeyEvent.KEYCODE_BUTTON_START), key_CONT_START,
+			};
 		}
-		if (prefs.getInt("b_button", -1) == KeyCode) {
-			return KeyEvent.KEYCODE_BUTTON_B;
-		}
-		if (prefs.getInt("x_button", -1) == KeyCode) {
-			return KeyEvent.KEYCODE_BUTTON_X;
-		}
-		if (prefs.getInt("y_button", -1) == KeyCode) {
-			return KeyEvent.KEYCODE_BUTTON_Y;
-		}
-		if (prefs.getInt("l_button", -1) == KeyCode) {
-			return KeyEvent.KEYCODE_BUTTON_L2;
-		}
-		if (prefs.getInt("r_button", -1) == KeyCode) {
-			return KeyEvent.KEYCODE_BUTTON_R2;
-		}
-		if (prefs.getInt("dpad_left", -1) == KeyCode) {
-			return KeyEvent.KEYCODE_DPAD_LEFT;
-		}
-		if (prefs.getInt("dpad_right", -1) == KeyCode) {
-			return KeyEvent.KEYCODE_DPAD_RIGHT;
-		}
-		if (prefs.getInt("dpad_up", -1) == KeyCode) {
-			return KeyEvent.KEYCODE_DPAD_UP;
-		}
-		if (prefs.getInt("dpad_down", -1) == KeyCode) {
-			return KeyEvent.KEYCODE_DPAD_DOWN;
-		}
-		if (prefs.getInt("start_button", -1) == KeyCode) {
-			return KeyEvent.KEYCODE_BUTTON_START;
-		}
-		return KeyCode;
 	}
 
 	class ExampleControllerListener implements ControllerListener
@@ -195,7 +176,7 @@ public class MOGAInput
 				JNIdc.hide_osd();
 
 			for (int i = 0; i < map.length; i += 2) {
-				if (map[i + 0] == getModifiedKey(event.getKeyCode())) {
+				if (map[i + 0] == event.getKeyCode()) {
 					if (event.getAction() == 0) //FIXME to const
 						GL2JNIView.kcode_raw[playerNum] &= ~map[i + 1];
 					else

From 998fa20c012bd59c47d3133f5adb04ef3700273f Mon Sep 17 00:00:00 2001
From: TwistedUmbrella <twistedumbrella@gmail.com>
Date: Thu, 23 Jan 2014 01:37:48 -0500
Subject: [PATCH 3/7] Set default value for custom key assign to false on first
 load

---
 shell/android/src/com/reicast/emulator/InputModFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell/android/src/com/reicast/emulator/InputModFragment.java b/shell/android/src/com/reicast/emulator/InputModFragment.java
index 07919d446..94639f018 100644
--- a/shell/android/src/com/reicast/emulator/InputModFragment.java
+++ b/shell/android/src/com/reicast/emulator/InputModFragment.java
@@ -55,7 +55,7 @@ public class InputModFragment extends Fragment {
 		switchModifiedLayoutEnabled = (Switch) getView().findViewById(
 				R.id.switchModifiedLayoutEnabled);
 		boolean layout = mPrefs.getBoolean(
-				"modified_key_layout", true);
+				"modified_key_layout", false);
 		if (layout) {
 			switchModifiedLayoutEnabled.setChecked(true);
 		} else {

From d7c1a1a0f471255f216ed949b4dda60931f7b513 Mon Sep 17 00:00:00 2001
From: TwistedUmbrella <twistedumbrella@gmail.com>
Date: Thu, 23 Jan 2014 08:53:00 -0500
Subject: [PATCH 4/7] Move rating to a menu option. Use resources for 2.3
 dialog

---
 .../res/layout/mainuilayout_fragment.xml      | 10 +++
 shell/android/res/values/strings.xml          |  2 +-
 .../com/reicast/emulator/MainActivity.java    | 65 +++++++++++--------
 3 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/shell/android/res/layout/mainuilayout_fragment.xml b/shell/android/res/layout/mainuilayout_fragment.xml
index a4f0fdba7..1262cb855 100644
--- a/shell/android/res/layout/mainuilayout_fragment.xml
+++ b/shell/android/res/layout/mainuilayout_fragment.xml
@@ -70,6 +70,16 @@
             android:layout_marginTop="2dp"
             android:scaleType="fitCenter"
             android:src="@drawable/question" />
+        
+        <ImageView
+            android:id="@+id/rate"
+            android:layout_width="48dp"
+            android:layout_height="fill_parent"
+            android:layout_marginBottom="2dp"
+            android:layout_marginLeft="2dp"
+            android:layout_marginTop="2dp"
+            android:scaleType="fitCenter"
+            android:src="@drawable/profiler" />
     </LinearLayout>
 
     <FrameLayout
diff --git a/shell/android/res/values/strings.xml b/shell/android/res/values/strings.xml
index dc302699e..96037c82f 100644
--- a/shell/android/res/values/strings.xml
+++ b/shell/android/res/values/strings.xml
@@ -49,7 +49,7 @@
     <string name="map_keycode_message">Press the new controller button for %1$s</string>
 
     <string name="about_title">About reicast</string>
-    <string name="about_text">reicast is a dreamcast emulator\n\nVersion: %1$s\n\nWe work hard for you\nShare the love back and rate the app!</string>
+    <string name="about_text">reicast is a dreamcast emulator\n\nVersion: %1$s\n\n</string>
     
     <string-array name="images">
         <item>cdi</item>
diff --git a/shell/android/src/com/reicast/emulator/MainActivity.java b/shell/android/src/com/reicast/emulator/MainActivity.java
index 3aee9d7ee..b7c80478b 100644
--- a/shell/android/src/com/reicast/emulator/MainActivity.java
+++ b/shell/android/src/com/reicast/emulator/MainActivity.java
@@ -128,6 +128,9 @@ public class MainActivity extends FragmentActivity implements
 			// About
 			navDrawerItems.add(new NavDrawerItem(navMenuTitles[4], navMenuIcons
 					.getResourceId(4, 0)));
+			// Rate
+			navDrawerItems.add(new NavDrawerItem(navMenuTitles[5], navMenuIcons
+					.getResourceId(5, 0)));
 
 			// Recycle the typed array
 			navMenuIcons.recycle();
@@ -236,23 +239,27 @@ public class MainActivity extends FragmentActivity implements
 								MainActivity.this);
 
 						// set title
-						alertDialogBuilder.setTitle("About reicast");
+						alertDialogBuilder.setTitle(getString(R.string.about_title));
+
+						String versionName = "";
+						try {
+							PackageInfo pInfo = getPackageManager().getPackageInfo(
+									getPackageName(), 0);
+							versionName = pInfo.versionName;
+						} catch (NameNotFoundException e) {
+							e.printStackTrace();
+						}
 
-						// set dialog message
 						alertDialogBuilder
-								.setMessage("reicast is a dreamcast emulator")
-								.setCancelable(false)
-								.setPositiveButton("Dismiss",
-										new DialogInterface.OnClickListener() {
-											public void onClick(
-													DialogInterface dialog,
-													int id) {
-												// if this button is clicked,
-												// close
-												// current activity
-												// FileBrowser.this.finish();
-											}
-										});
+							.setMessage(getString(R.string.about_text, versionName))
+							.setCancelable(false)
+							.setPositiveButton("Dismiss",
+									new DialogInterface.OnClickListener() {
+										public void onClick(DialogInterface dialog,
+												int id) {
+											dialog.dismiss();
+										}
+									});
 
 						// create alert dialog
 						AlertDialog alertDialog = alertDialogBuilder.create();
@@ -264,6 +271,17 @@ public class MainActivity extends FragmentActivity implements
 						return false;
 				}
 			});
+			findViewById(R.id.rate).setOnTouchListener(new OnTouchListener() {
+				public boolean onTouch(View v, MotionEvent event) {
+					if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
+						// vib.vibrate(50);
+						startActivity(new Intent(Intent.ACTION_VIEW,
+							Uri.parse("market://details?id=" + getPackageName())));
+						return true;
+					} else
+						return false;
+				}
+			});
 		}
 
 	}
@@ -483,21 +501,11 @@ public class MainActivity extends FragmentActivity implements
 				alertDialogBuilder
 						.setMessage(getString(R.string.about_text, versionName))
 						.setCancelable(false)
-						.setPositiveButton("Rate It",
+						.setPositiveButton("Dismiss",
 								new DialogInterface.OnClickListener() {
 									public void onClick(DialogInterface dialog,
 											int id) {
-										startActivity(new Intent(
-												Intent.ACTION_VIEW,
-												Uri.parse("market://details?id="
-														+ getPackageName())));
-									}
-								})
-						.setNegativeButton("Dismiss",
-								new DialogInterface.OnClickListener() {
-									public void onClick(DialogInterface dialog,
-											int id) {
-
+										dialog.dismiss();
 									}
 								});
 
@@ -508,6 +516,9 @@ public class MainActivity extends FragmentActivity implements
 				alertDialog.show();
 			break;
 
+		case 5:
+			startActivity(new Intent(Intent.ACTION_VIEW,
+				Uri.parse("market://details?id=" + getPackageName())));
 		default:
 			break;
 		}

From ba973c5b183e35f3a97950b80ed1d74807c380e6 Mon Sep 17 00:00:00 2001
From: TwistedUmbrella <twistedumbrella@gmail.com>
Date: Thu, 23 Jan 2014 08:53:30 -0500
Subject: [PATCH 5/7] Remove unnecessary Ouya import from Moga (copy-paste)

---
 shell/android/src/com/reicast/emulator/MOGAInput.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/shell/android/src/com/reicast/emulator/MOGAInput.java b/shell/android/src/com/reicast/emulator/MOGAInput.java
index cda68871f..c7454f535 100644
--- a/shell/android/src/com/reicast/emulator/MOGAInput.java
+++ b/shell/android/src/com/reicast/emulator/MOGAInput.java
@@ -3,7 +3,6 @@ package com.reicast.emulator;
 
 /******************************************************************************/
 
-import tv.ouya.console.api.OuyaController;
 import android.app.Activity;
 import android.content.SharedPreferences;
 import android.os.Handler;

From 46155b0a62c598dce25d557bafb87277a0de44c3 Mon Sep 17 00:00:00 2001
From: TwistedUmbrella <twistedumbrella@gmail.com>
Date: Fri, 24 Jan 2014 01:23:37 -0500
Subject: [PATCH 6/7] Support per-player moga config, Disable pro config for
 now

---
 shell/android/res/values/strings.xml          |  3 +++
 .../com/reicast/emulator/GL2JNIActivity.java  |  6 +++---
 .../src/com/reicast/emulator/MOGAInput.java   | 19 ++++++++++++++++---
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/shell/android/res/values/strings.xml b/shell/android/res/values/strings.xml
index 96037c82f..7b4a63ff0 100644
--- a/shell/android/res/values/strings.xml
+++ b/shell/android/res/values/strings.xml
@@ -47,6 +47,9 @@
     <string name="menu_edit_keycodes">Edit Key Bindings</string>
     <string name="map_keycode_title">Modify Controller</string>
     <string name="map_keycode_message">Press the new controller button for %1$s</string>
+    
+    <string name="moga_pro_connect">MOGA Pro Connected!</string>
+    <string name="moga_connect">MOGA Connected!</string>
 
     <string name="about_title">About reicast</string>
     <string name="about_text">reicast is a dreamcast emulator\n\nVersion: %1$s\n\n</string>
diff --git a/shell/android/src/com/reicast/emulator/GL2JNIActivity.java b/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
index e5d7a1c3e..e64b12d4a 100644
--- a/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
+++ b/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
@@ -277,7 +277,7 @@ public class GL2JNIActivity extends Activity {
 
 						globalLS_X[playerNum] = previousLS_X[playerNum] = 0.0f;
 						globalLS_Y[playerNum] = previousLS_Y[playerNum] = 0.0f;
-					} else if (!moga.isActive) { // Ouya controller
+					} else if (!moga.isActive[playerNum] && !moga.isMogaPro[playerNum]) { // Ouya controller
 						map[playerNum] = new int[] {
 							OuyaController.BUTTON_O, key_CONT_A,
 							OuyaController.BUTTON_A, key_CONT_B,
@@ -340,7 +340,7 @@ public class GL2JNIActivity extends Activity {
 			if (playerNum == null)
 				return false;
 
-			if (!moga.isActive) {
+			if (!moga.isActive[playerNum] && !moga.isMogaPro[playerNum]) {
 
 				// Joystick
 				if ((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
@@ -432,7 +432,7 @@ public class GL2JNIActivity extends Activity {
 		if (playerNum == null)
 			return false;
 
-		if (!moga.isActive) {
+		if (!moga.isActive[playerNum] && !moga.isMogaPro[playerNum]) {
 
 			boolean rav = false;
 			for (int i = 0; i < map[playerNum].length; i += 2) {
diff --git a/shell/android/src/com/reicast/emulator/MOGAInput.java b/shell/android/src/com/reicast/emulator/MOGAInput.java
index c7454f535..08d53f905 100644
--- a/shell/android/src/com/reicast/emulator/MOGAInput.java
+++ b/shell/android/src/com/reicast/emulator/MOGAInput.java
@@ -33,7 +33,8 @@ public class MOGAInput
 
 	Controller mController = null;
 
-    public boolean isActive = false;
+    public boolean isActive[] = { false, false, false, false };
+    public boolean isMogaPro[] = { false, false, false, false };
 
 	private static final int key_CONT_B 			= 0x0002;
 	private static final int key_CONT_A 			= 0x0004;
@@ -227,8 +228,20 @@ public class MOGAInput
 				JNIdc.hide_osd();
 
 			if (event.getState() == StateEvent.STATE_CONNECTION && event.getAction() == ACTION_CONNECTED) {
-        		Toast.makeText(act.getApplicationContext(), "MOGA Connected!", Toast.LENGTH_SHORT).show();
-        		isActive = true;
+        		int mControllerVersion = mController.getState(Controller.STATE_CURRENT_PRODUCT_VERSION);
+        		String notify = null;
+        		if (mControllerVersion == Controller.ACTION_VERSION_MOGAPRO) {
+        			isActive[playerNum] = true;
+        			isMogaPro[playerNum] = true;
+        			notify = act.getApplicationContext().getString(R.string.moga_pro_connect);
+        		} else if (mControllerVersion == Controller.ACTION_VERSION_MOGA) {
+        			isActive[playerNum] = true;
+        			isMogaPro[playerNum] = false;
+        			notify = act.getApplicationContext().getString(R.string.moga_connect);
+        		}
+        		if (notify != null && !notify.equals(null)) {
+        			Toast.makeText(act.getApplicationContext(), notify, Toast.LENGTH_SHORT).show();
+        		}
 			}
 		}
 	}

From 5ec7e5bc0d37941a4881e7406e772666322666d7 Mon Sep 17 00:00:00 2001
From: TwistedUmbrella <twistedumbrella@gmail.com>
Date: Fri, 24 Jan 2014 09:26:13 -0500
Subject: [PATCH 7/7] Support per-player moga config, Cleanup the rating change

---
 shell/android/res/values/strings.xml                     | 2 ++
 .../android/src/com/reicast/emulator/GL2JNIActivity.java | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/shell/android/res/values/strings.xml b/shell/android/res/values/strings.xml
index 7b4a63ff0..def63e00e 100644
--- a/shell/android/res/values/strings.xml
+++ b/shell/android/res/values/strings.xml
@@ -77,6 +77,7 @@
         <item>Paths</item>
         <item>Input</item>
         <item>About</item>
+        <item>Rate Me</item>
     </string-array>
 
     <!-- Nav Drawer List Item Icons -->
@@ -87,6 +88,7 @@
         <item>@drawable/open_folder</item>
         <item>@drawable/input</item>
         <item>@drawable/question</item>
+        <item>@drawable/profiler</item>
     </array>
 
     <!-- Content Description -->
diff --git a/shell/android/src/com/reicast/emulator/GL2JNIActivity.java b/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
index e64b12d4a..dd152692d 100644
--- a/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
+++ b/shell/android/src/com/reicast/emulator/GL2JNIActivity.java
@@ -277,7 +277,7 @@ public class GL2JNIActivity extends Activity {
 
 						globalLS_X[playerNum] = previousLS_X[playerNum] = 0.0f;
 						globalLS_Y[playerNum] = previousLS_Y[playerNum] = 0.0f;
-					} else if (!moga.isActive[playerNum] && !moga.isMogaPro[playerNum]) { // Ouya controller
+					} else if (!moga.isActive[playerNum]) { // Ouya controller
 						map[playerNum] = new int[] {
 							OuyaController.BUTTON_O, key_CONT_A,
 							OuyaController.BUTTON_A, key_CONT_B,
@@ -290,7 +290,8 @@ public class GL2JNIActivity extends Activity {
 							OuyaController.BUTTON_DPAD_RIGHT, key_CONT_DPAD_RIGHT,
 
 							OuyaController.BUTTON_MENU, key_CONT_START,
-							OuyaController.BUTTON_R1, key_CONT_START };
+							OuyaController.BUTTON_R1, key_CONT_START
+						};
 					}
 				}
 
@@ -340,7 +341,7 @@ public class GL2JNIActivity extends Activity {
 			if (playerNum == null)
 				return false;
 
-			if (!moga.isActive[playerNum] && !moga.isMogaPro[playerNum]) {
+			if (!moga.isActive[playerNum]) {
 
 				// Joystick
 				if ((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
@@ -432,7 +433,7 @@ public class GL2JNIActivity extends Activity {
 		if (playerNum == null)
 			return false;
 
-		if (!moga.isActive[playerNum] && !moga.isMogaPro[playerNum]) {
+		if (!moga.isActive[playerNum]) {
 
 			boolean rav = false;
 			for (int i = 0; i < map[playerNum].length; i += 2) {