diff options
Diffstat (limited to 'Source/Android/src')
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java | 4 | ||||
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java index f3317c9e8c..027d476095 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/NativeLibrary.java @@ -69,8 +69,10 @@ public final class NativeLibrary * @param Device The input descriptor of the gamepad. * @param Button Key code identifying which button was pressed. * @param Action Mask identifying which action is happing (button pressed down, or button released). + * + * @return If we handled the button press. */ - public static native void onGamePadEvent(String Device, int Button, int Action); + public static native boolean onGamePadEvent(String Device, int Button, int Action); /** * Handles gamepad movement events. diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java index 41c523ed68..7775e2124c 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java @@ -285,8 +285,8 @@ public final class EmulationActivity extends Activity return false; } InputDevice input = event.getDevice(); - NativeLibrary.onGamePadEvent(InputConfigFragment.getInputDesc(input), event.getKeyCode(), action); - return true; + boolean handled = NativeLibrary.onGamePadEvent(InputConfigFragment.getInputDesc(input), event.getKeyCode(), action); + return handled; } return false; } |