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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23319874

Change-Id: I3f8ffa5afe4dbe34fd9df80b2dfbe4455807a1d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 20b1fed..6f1d733 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -6966,7 +6966,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;