commit f7d8fbcad1a290f1477d19ea61a51e29fd5fed25
author Jackal Guo <jackalguo@google.com> Mon Oct 15 02:07:32 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 15 02:07:32 2018 +0000
tree d7fb7e389d8b40051fb159b301d15ba2be9eb947
parent 2d3972e2f1b86c33adeb5d9bee953cebac4b20df
parent d9d4f11ea29771c83413ada3492aeb4e24f59b3a

Merge "Start a11y shortcut via keyboard"

services/core/java/com/android/server/policy/PhoneWindowManager.java

diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 21bf488..06ee935 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -6046,6 +6046,19 @@
             }
         }
 
+        // Intercept the Accessibility keychord (CTRL + ALT + Z) for keyboard users.
+        if (mAccessibilityShortcutController.isAccessibilityShortcutAvailable(isKeyguardLocked())) {
+            switch (keyCode) {
+                case KeyEvent.KEYCODE_Z: {
+                    if (down && event.isCtrlPressed() && event.isAltPressed()) {
+                        mHandler.sendMessage(mHandler.obtainMessage(MSG_ACCESSIBILITY_SHORTCUT));
+                        result &= ~ACTION_PASS_TO_USER;
+                    }
+                    break;
+                }
+            }
+        }
+
         if (useHapticFeedback) {
             performHapticFeedbackLw(null, HapticFeedbackConstants.VIRTUAL_KEY, false,
                     "Virtual Key - Press");