Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0aa2e477 authored by Josep del Río's avatar Josep del Río Committed by Automerger Merge Worker
Browse files

Merge "Use Ctrl+Tab to navigate focus clusters" into udc-dev am: a3542a9c am: 39714de7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23122443



Change-Id: I26ad77c20515cc5687f73b79250d35e1f9e6c8bd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0e6605c6 39714de7

core/java/android/view/ViewRootImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -6975,10 +6975,10 @@ public final class ViewRootImpl implements ViewParent, 


            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;

                }

            }