summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tracy Zhou <tracyzhou@google.com> 2023-05-24 04:59:27 +0000
committer Tracy Zhou <tracyzhou@google.com> 2023-05-24 16:27:42 +0000
commita6f19d86f069fe6fe2e7c75625bce1a19e52a167 (patch)
tree249d6da2f8f66e42e04b764ed33eeb07b518b766
parent2a5502da79c1041664367e9ad0bae736c1e8a457 (diff)
Revert "Remap accessing action bar shortcut to META+CTRL+TAB"
Revert submission 23374698-update_meta_ctrl_shortcut Reason for revert: This fix is problematic 1. The logic in ViewRootImpl uses CTRL+TAB in the latest patch. CTS test is probably unrelated to the change in ViewRootImpl. 2. Since this should be fixed in UDC (a cherry pick is in flight), will try to find a fix in the next few days in udc Fix forward: ag/23407268 Reverted changes: /q/submissionid:23374698-update_meta_ctrl_shortcut Change-Id: I98e0e1a7bd25ff961b1766857bb5eeb95d5fd9e9
-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;