commit 27228a02067cba78b674910bf0d9d2abed493630
author Vaibhav Devmurari <vdevmurari@google.com> Fri Feb 21 14:40:48 2025 +0000
committer Vaibhav Devmurari <vdevmurari@google.com> Fri Feb 21 06:51:46 2025 -0800
tree e5c64f9e2fc29966b085b663890c704e2c337a62
parent 94fba95e67330d585ce04fc7622bce313fcf0b21

Remove A11y feature dependent shortcuts from blocklisted triggers

A11y services have access to key events through input filter which
is earlier in input pipeline than KGC shortcut handling. So, we
don't need to reserve these shortcuts. This allows users to set
these key combinations as custom shortcuts.
Since, most users wont have A11y services like magnification,
talkback, etc enabled, it makes sense to have these combinations
available for custom shortcuts (discussed with A11y PM and UX).

Test: atest InputTests
Bug: 398195149
Flag: EXEMPT bugfix
Change-Id: Ia7c1085a4d2d28687c2187f3bc7eb10c75f89e63

services/core/java/com/android/server/input/InputGestureManager.java

diff --git a/services/core/java/com/android/server/input/InputGestureManager.java b/services/core/java/com/android/server/input/InputGestureManager.java
index d71c8a1..7f85384 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 @@
             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) {