From 2a1290e70f296e36fdfbf31b5248cd3b0a6fb48a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 28 Jun 2013 21:45:21 +0200 Subject: [PATCH] (Android) r17 - 0.9.9.3 changelog (Android) Change Ouya button binds --- android/native/jni/input_android.c | 6 +++--- android/phoenix/AndroidManifest.xml | 4 ++-- android/phoenix/assets/Shaders/.dummy | 0 android/phoenix/res/layout/faq_whats_new.xml | 11 +++++++++++ 4 files changed, 16 insertions(+), 5 deletions(-) delete mode 100644 android/phoenix/assets/Shaders/.dummy diff --git a/android/native/jni/input_android.c b/android/native/jni/input_android.c index 88e9205d8b..671e6d1c80 100644 --- a/android/native/jni/input_android.c +++ b/android/native/jni/input_android.c @@ -1174,9 +1174,9 @@ static void android_input_set_keybinds(void *data, unsigned device, keycode_lut[AKEYCODE_BUTTON_R1] |= ((RETRO_DEVICE_ID_JOYPAD_R+1) << shift); keycode_lut[AKEYCODE_BUTTON_L2] |= ((RETRO_DEVICE_ID_JOYPAD_L2+1) << shift); keycode_lut[AKEYCODE_BUTTON_R2] |= ((RETRO_DEVICE_ID_JOYPAD_R2+1) << shift); - keycode_lut[AKEYCODE_BUTTON_THUMBL] |= ((RETRO_DEVICE_ID_JOYPAD_L3+1) << shift); - keycode_lut[AKEYCODE_BUTTON_THUMBR] |= ((RETRO_DEVICE_ID_JOYPAD_R3+1) << shift); - keycode_lut[AKEYCODE_MENU] |= ((RETRO_DEVICE_ID_JOYPAD_START+1) << shift); + keycode_lut[AKEYCODE_BUTTON_THUMBL] |= ((RETRO_DEVICE_ID_JOYPAD_SELECT+1) << shift); + keycode_lut[AKEYCODE_BUTTON_THUMBR] |= ((RETRO_DEVICE_ID_JOYPAD_START+1) << shift); + keycode_lut[AKEYCODE_MENU] |= ((RARCH_MENU_TOGGLE+1) << shift); break; case DEVICE_HOLTEK_JC_U912F: g_settings.input.device[port] = device; diff --git a/android/phoenix/AndroidManifest.xml b/android/phoenix/AndroidManifest.xml index 91a2251e12..5a387e090b 100644 --- a/android/phoenix/AndroidManifest.xml +++ b/android/phoenix/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:versionCode="17" + android:versionName="0.9.9.3" >