From 4af2a566f91a9057ece9fc5bff7beb82ec6df712 Mon Sep 17 00:00:00 2001 From: TwistedUmbrella Date: Fri, 24 Jan 2014 10:00:17 -0500 Subject: [PATCH] Cleaning up the key orders, Finding copy-paste mistakes --- .../com/reicast/emulator/GL2JNIActivity.java | 21 +++++++++---------- .../src/com/reicast/emulator/MOGAInput.java | 4 ++-- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/shell/android/src/com/reicast/emulator/GL2JNIActivity.java b/shell/android/src/com/reicast/emulator/GL2JNIActivity.java index dd152692d..7cac6b25a 100644 --- a/shell/android/src/com/reicast/emulator/GL2JNIActivity.java +++ b/shell/android/src/com/reicast/emulator/GL2JNIActivity.java @@ -1,18 +1,16 @@ package com.reicast.emulator; -import java.io.IOException; -import java.io.InputStream; import java.util.HashMap; -import tv.ouya.console.api.OuyaController; - +// Keeping a reference just in case it's needed import com.reicast.emulator.GL2JNIView.EmuThread; -import android.content.SharedPreferences; +import tv.ouya.console.api.OuyaController; import android.annotation.TargetApi; import android.app.Activity; import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; import android.content.res.Configuration; import android.net.Uri; import android.os.Build; @@ -222,10 +220,11 @@ public class GL2JNIActivity extends Activity { } 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, + OuyaController.BUTTON_U, key_CONT_X, + OuyaController.BUTTON_Y, key_CONT_Y, + OuyaController.BUTTON_DPAD_UP, key_CONT_DPAD_UP, OuyaController.BUTTON_DPAD_DOWN, key_CONT_DPAD_DOWN, @@ -241,8 +240,8 @@ public class GL2JNIActivity extends Activity { 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_Y, key_CONT_Y, OuyaController.BUTTON_DPAD_UP, key_CONT_DPAD_UP, OuyaController.BUTTON_DPAD_DOWN, key_CONT_DPAD_DOWN, @@ -262,8 +261,8 @@ public class GL2JNIActivity extends Activity { 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_Y, key_CONT_Y, OuyaController.BUTTON_DPAD_UP, key_CONT_DPAD_UP, OuyaController.BUTTON_DPAD_DOWN, key_CONT_DPAD_DOWN, @@ -281,8 +280,8 @@ public class GL2JNIActivity extends Activity { 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_Y, key_CONT_Y, OuyaController.BUTTON_DPAD_UP, key_CONT_DPAD_UP, OuyaController.BUTTON_DPAD_DOWN, key_CONT_DPAD_DOWN, @@ -316,8 +315,8 @@ public class GL2JNIActivity extends Activity { 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, + prefs.getInt("y_button", OuyaController.BUTTON_Y), key_CONT_Y, prefs.getInt("dpad_up", OuyaController.BUTTON_DPAD_UP), key_CONT_DPAD_UP, prefs.getInt("dpad_down", OuyaController.BUTTON_DPAD_DOWN), key_CONT_DPAD_DOWN, diff --git a/shell/android/src/com/reicast/emulator/MOGAInput.java b/shell/android/src/com/reicast/emulator/MOGAInput.java index 08d53f905..9d7538fca 100644 --- a/shell/android/src/com/reicast/emulator/MOGAInput.java +++ b/shell/android/src/com/reicast/emulator/MOGAInput.java @@ -148,10 +148,10 @@ public class MOGAInput .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("b_button", KeyEvent.KEYCODE_BUTTON_B), key_CONT_B, prefs.getInt("x_button", KeyEvent.KEYCODE_BUTTON_X), key_CONT_X, - prefs.getInt("l_button", KeyEvent.KEYCODE_BUTTON_Y), key_CONT_Y, + prefs.getInt("y_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,