ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ouya again

This commit is contained in:
Bryan Barnes 2014-02-24 23:38:04 -05:00
parent 3f4a97ecc1
commit f1b384ac2e
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
shell/android/src/com/reicast/emulator/GL2JNIActivity.java
View File

@ -190,7 +190,7 @@ public class GL2JNIActivity extends Activity {
if (pad.isXperiaPlay) { if (pad.isXperiaPlay) {
menu_spec = getApplicationContext().getString(R.string.menu_button); menu_spec = getApplicationContext().getString(R.string.menu_button);
} else if (pad.isOuyaOrTV) { } else if (pad.isOuyaOrTV) {
menu_spec = getApplicationContext().getString(R.string.right_button); menu_spec = getApplicationContext().getString(R.string.menu_button);
} else { } else {
menu_spec = getApplicationContext().getString(R.string.back_button); menu_spec = getApplicationContext().getString(R.string.back_button);
} }
@ -520,7 +520,7 @@ public class GL2JNIActivity extends Activity {
return showMenu(); return showMenu();
} }
} }
if (keyCode == KeyEvent.KEYCODE_BACK) { if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == OuyaController.BUTTON_MENU) {
if (pad.isXperiaPlay) { if (pad.isXperiaPlay) {
return true; return true;
} else { } else {

4
shell/android/src/com/reicast/emulator/periph/Gamepad.java
View File

@ -97,9 +97,7 @@ public class Gamepad {
OuyaController.BUTTON_DPAD_LEFT, key_CONT_DPAD_LEFT, OuyaController.BUTTON_DPAD_LEFT, key_CONT_DPAD_LEFT,
OuyaController.BUTTON_DPAD_RIGHT, key_CONT_DPAD_RIGHT, OuyaController.BUTTON_DPAD_RIGHT, key_CONT_DPAD_RIGHT,
OuyaController.BUTTON_MENU, key_CONT_START, OuyaController.BUTTON_R3, key_CONT_START,
getStartButtonCode(), key_CONT_START,
OuyaController.BUTTON_R3, getSelectButtonCode()
}; };
} }