From ddfc85280da31a07beeaf9bde4f118d6539b94e6 Mon Sep 17 00:00:00 2001
From: Shaun Thompson <neko68k@gmail.com>
Date: Sun, 22 Dec 2013 13:36:15 -0700
Subject: [PATCH] fixed the last commit. also forgot to mention controller
 names require api 16.

---
 .../com/reicast/emulator/GL2JNIActivity.java  | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/reicast/android/src/com/reicast/emulator/GL2JNIActivity.java b/reicast/android/src/com/reicast/emulator/GL2JNIActivity.java
index 124001e63..caa14d24f 100644
--- a/reicast/android/src/com/reicast/emulator/GL2JNIActivity.java
+++ b/reicast/android/src/com/reicast/emulator/GL2JNIActivity.java
@@ -154,22 +154,22 @@ public class GL2JNIActivity extends Activity
         for(int i = 0;i<joys.length; i++){
         	Log.d("reidc", "InputDevice ID: "+joys[i]);
         	Log.d("reidc", "InputDevice Name: "+ InputDevice.getDevice(joys[i]).getName());
-    	if(InputDevice.getDevice(joys[i]).getName()=="Sony PLAYSTATION(R)3 Controller"){
+    	if(InputDevice.getDevice(joys[i]).getName().equals("Sony PLAYSTATION(R)3 Controller")){
     		map = new int[] { 
-    				  OuyaController.BUTTON_Y, 	key_CONT_B,
-    				  OuyaController.BUTTON_U, 	key_CONT_A,
-    				  OuyaController.BUTTON_O, 	key_CONT_X,
-    				  OuyaController.BUTTON_A, 	key_CONT_Y,
+					OuyaController.BUTTON_Y, 	key_CONT_B,
+					OuyaController.BUTTON_U, 	key_CONT_A,
+					OuyaController.BUTTON_O, 	key_CONT_X,
+					OuyaController.BUTTON_A, 	key_CONT_Y,
+					  
+					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_L1, key_CONT_START
     				  
-    				  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_L1, key_CONT_START
-    				  
-    		  };
+    		  };    		
     	}else{	// Ouya controller
     		map = new int[] { 
     				OuyaController.BUTTON_O,         key_CONT_A,