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

Commit fdac44dc authored by Evan Rosky's avatar Evan Rosky Committed by android-build-merger
Browse files

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

am: f4c31bf6

Change-Id: I463f9cc2852cf085dc278fc080a583828d4311a9
parents 5d2553f6 f4c31bf6

core/java/android/view/ViewRootImpl.java

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

                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

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