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

Commit a5abe8f1 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Handle edge-case where no focusables exist" into oc-dev am:... 

Merge "Merge "Handle edge-case where no focusables exist" into oc-dev am: f4c31bf6" into oc-dev-plus-aosp
parents 20a75de6 fdac44dc

core/java/android/view/ViewRootImpl.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -4675,7 +4675,8 @@ public final class ViewRootImpl implements ViewParent, 
            if (focused == null && mView.restoreDefaultFocus()) {

            if (focused == null && mView.restoreDefaultFocus()) {

                return true;

                return true;

            }

            }

            View cluster = focused.keyboardNavigationClusterSearch(null, direction);

            View cluster = focused == null ? keyboardNavigationClusterSearch(null, direction)

                    : focused.keyboardNavigationClusterSearch(null, direction);





            // Since requestFocus only takes "real" focus directions (and therefore also

            // Since requestFocus only takes "real" focus directions (and therefore also

            // restoreFocusInCluster), convert forward/backward focus into FOCUS_DOWN.

            // restoreFocusInCluster), convert forward/backward focus into FOCUS_DOWN.