commit ca06d0ae7c82ce0a27986d2cf08290467c0f60a6
author Tracy Zhou <tracyzhou@google.com> Tue May 23 20:31:18 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 23 20:31:18 2023 +0000
tree f3f5e6bc754f1de08b953412ee4cbfc1b53ce522
parent fce7568ecc87dc4ead64059345db2fc63b7b6285
parent 2a5502da79c1041664367e9ad0bae736c1e8a457

Merge "Remap accessing action bar shortcut to META+CTRL+TAB" into udc-qpr-dev

core/java/android/view/ViewRootImpl.java

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 4cbb040..6cc7e22 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -6967,7 +6967,7 @@
 
             int groupNavigationDirection = 0;
 
-            if (event.getAction() == KeyEvent.ACTION_DOWN
+            if (event.getAction() == KeyEvent.ACTION_DOWN && event.isCtrlPressed()
                     && event.getKeyCode() == KeyEvent.KEYCODE_TAB) {
                 if (KeyEvent.metaStateHasModifiers(event.getMetaState(), KeyEvent.META_CTRL_ON)) {
                     groupNavigationDirection = View.FOCUS_FORWARD;