commit a3542a9c05baa73f351eb22aed59213e1f54425b
author Josep del Río <joseprio@google.com> Fri May 12 12:30:11 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 12 12:30:11 2023 +0000
tree 59bde1ddb49c027b45f6c7fbb40d29364c29609b
parent 359f2830d41532c0ca3b4f0e03420e0c42233010
parent 83efd61ed5aff70af964eb144e29707fd6a11753

Merge "Use Ctrl+Tab to navigate focus clusters" into udc-dev

core/java/android/view/ViewRootImpl.java

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index f662c73..4cbb040 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -6969,10 +6969,10 @@
 
             if (event.getAction() == KeyEvent.ACTION_DOWN
                     && event.getKeyCode() == KeyEvent.KEYCODE_TAB) {
-                if (KeyEvent.metaStateHasModifiers(event.getMetaState(), KeyEvent.META_META_ON)) {
+                if (KeyEvent.metaStateHasModifiers(event.getMetaState(), KeyEvent.META_CTRL_ON)) {
                     groupNavigationDirection = View.FOCUS_FORWARD;
                 } else if (KeyEvent.metaStateHasModifiers(event.getMetaState(),
-                        KeyEvent.META_META_ON | KeyEvent.META_SHIFT_ON)) {
+                        KeyEvent.META_CTRL_ON | KeyEvent.META_SHIFT_ON)) {
                     groupNavigationDirection = View.FOCUS_BACKWARD;
                 }
             }