summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vaibhav Devmurari <vdevmurari@google.com> 2025-02-24 10:45:25 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2025-02-24 10:45:25 -0800
commit915fc00ec9054463bf68a146447dd570f3ca0e89 (patch)
tree3f91dca0b2d5b3000a7bbfe987022f122486ba22
parent883ff52e1b5a5d502a1c8e4c01b38dde42427ac7 (diff)
parent27228a02067cba78b674910bf0d9d2abed493630 (diff)
Merge "Remove A11y feature dependent shortcuts from blocklisted triggers" into main
-rw-r--r--services/core/java/com/android/server/input/InputGestureManager.java15
1 files changed, 1 insertions, 14 deletions
diff --git a/services/core/java/com/android/server/input/InputGestureManager.java b/services/core/java/com/android/server/input/InputGestureManager.java
index d71c8a1056d9..7f853844c326 100644
--- a/services/core/java/com/android/server/input/InputGestureManager.java
+++ b/services/core/java/com/android/server/input/InputGestureManager.java
@@ -87,20 +87,7 @@ final class InputGestureManager {
createKeyTrigger(KeyEvent.KEYCODE_V, KeyEvent.META_CTRL_ON),
createKeyTrigger(KeyEvent.KEYCODE_X, KeyEvent.META_CTRL_ON),
createKeyTrigger(KeyEvent.KEYCODE_Z, KeyEvent.META_CTRL_ON),
- createKeyTrigger(KeyEvent.KEYCODE_Y, KeyEvent.META_CTRL_ON),
- // Used for magnification viewport control.
- createKeyTrigger(KeyEvent.KEYCODE_MINUS,
- KeyEvent.META_META_ON | KeyEvent.META_ALT_ON),
- createKeyTrigger(KeyEvent.KEYCODE_EQUALS,
- KeyEvent.META_META_ON | KeyEvent.META_ALT_ON),
- createKeyTrigger(KeyEvent.KEYCODE_DPAD_LEFT,
- KeyEvent.META_META_ON | KeyEvent.META_ALT_ON),
- createKeyTrigger(KeyEvent.KEYCODE_DPAD_RIGHT,
- KeyEvent.META_META_ON | KeyEvent.META_ALT_ON),
- createKeyTrigger(KeyEvent.KEYCODE_DPAD_UP,
- KeyEvent.META_META_ON | KeyEvent.META_ALT_ON),
- createKeyTrigger(KeyEvent.KEYCODE_DPAD_DOWN,
- KeyEvent.META_META_ON | KeyEvent.META_ALT_ON)
+ createKeyTrigger(KeyEvent.KEYCODE_Y, KeyEvent.META_CTRL_ON)
));
public InputGestureManager(Context context) {