From a6f19d86f069fe6fe2e7c75625bce1a19e52a167 Mon Sep 17 00:00:00 2001 From: Tracy Zhou Date: Wed, 24 May 2023 04:59:27 +0000 Subject: [PATCH] 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 --- 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 6cc7e225087d9..4cbb0409dafcf 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;