From 5ca0ae4194d1d4c00191da14a6f18d5b05ae1c3d Mon Sep 17 00:00:00 2001 From: FearlessTobi Date: Sat, 28 Mar 2020 20:49:14 +0100 Subject: [PATCH] Android: fix/ignore L2/R2 buttons L2/R2 will trigger a key press and an axis event if the trigger is pressed fully down Was incorrectly ignoring L1/R1 key presses. Original commit by zackhow for Dolphin-emu. --- .../org/citra/citra_emu/utils/ControllerMappingHelper.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/ControllerMappingHelper.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/ControllerMappingHelper.java index 75670dbdb..f801a05f0 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/utils/ControllerMappingHelper.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/ControllerMappingHelper.java @@ -15,8 +15,7 @@ public class ControllerMappingHelper { if (isDualShock4(inputDevice)) { // The two analog triggers generate analog motion events as well as a keycode. // We always prefer to use the analog values, so throw away the button press - // Even though the triggers are L/R2, without mappings they generate L/R1 events. - return keyCode == KeyEvent.KEYCODE_BUTTON_L1 || keyCode == KeyEvent.KEYCODE_BUTTON_R1; + return keyCode == KeyEvent.KEYCODE_BUTTON_L2 || keyCode == KeyEvent.KEYCODE_BUTTON_R2; } return false; }