From 2a5502da79c1041664367e9ad0bae736c1e8a457 Mon Sep 17 00:00:00 2001
From: Tracy Zhou <tracyzhou@google.com>
Date: Thu, 18 May 2023 17:07:04 +0000
Subject: [PATCH] Remap accessing action bar shortcut to META+CTRL+TAB

- Now META+TAB is mapped to launching overview
- We need a different shortcut for moving focus forward or backward

Bug: 261998942
Test: presubmit
Change-Id: I6be2058070e22c7a1c8b100307409061a13dc8ae
---
 core/java/android/view/ViewRootImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 4cbb0409dafcf..6cc7e225087d9 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -6967,7 +6967,7 @@ public final class ViewRootImpl implements ViewParent,
 
             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;