summaryrefslogtreecommitdiff
path: root/Source/Android/app/src/main/java
diff options
context:
space:
mode:
authorzackhow <zackhow@gmail.com>2018-12-14 15:19:11 -0500
committerzackhow <zackhow@gmail.com>2018-12-14 15:31:13 -0500
commit0c0e045eda0b248d514c98f286ebe4f926bfb9d8 (patch)
tree7433bc1b0aca0cd3742eaa66b8e9b07c26e25e54 /Source/Android/app/src/main/java
parent2dcd058f7d87a0a95289b23473ae0e7321005110 (diff)
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
Diffstat (limited to 'Source/Android/app/src/main/java')
-rw-r--r--Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ControllerMappingHelper.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ControllerMappingHelper.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ControllerMappingHelper.java
index f3c8bb41f3..76ee00722f 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ControllerMappingHelper.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ControllerMappingHelper.java
@@ -18,8 +18,7 @@ public class ControllerMappingHelper
{
// 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;
}