summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tracy Zhou <tracyzhou@google.com> 2023-05-24 23:59:16 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-05-24 23:59:16 +0000
commite41ee604ca8c11f277c42fdd7c67bcc8ef51aa17 (patch)
tree93e467908c015543505880d16c9c6365ee49d39a
parent531565e646d6c21795ec6aa3544a9a159391f118 (diff)
parenta6f19d86f069fe6fe2e7c75625bce1a19e52a167 (diff)
Merge "Revert "Remap accessing action bar shortcut to META+CTRL+TAB"" into udc-qpr-dev
-rw-r--r--core/java/android/view/ViewRootImpl.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 6cc7e225087d..4cbb0409dafc 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 && event.isCtrlPressed()
+ if (event.getAction() == KeyEvent.ACTION_DOWN
&& event.getKeyCode() == KeyEvent.KEYCODE_TAB) {
if (KeyEvent.metaStateHasModifiers(event.getMetaState(), KeyEvent.META_CTRL_ON)) {
groupNavigationDirection = View.FOCUS_FORWARD;