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

Commit ae938cee authored by Evan Rosky's avatar Evan Rosky Committed by Android (Google) Code Review
Browse files

Merge "Gracefully handle focus loops created by app dev." into oc-dr1-dev

parents c7937c13 9d93486e

core/java/android/view/FocusFinder.java

+10 −0
Original line number Diff line number Diff line
@@ -193,6 +193,8 @@ public class FocusFinder { 
    private View findNextUserSpecifiedFocus(ViewGroup root, View focused, int direction) {

        // check for user specified next focus

        View userSetNextFocus = focused.findUserSetNextFocus(root, direction);

        View cycleCheck = userSetNextFocus;

        boolean cycleStep = true; // we want the first toggle to yield false

        while (userSetNextFocus != null) {

            if (userSetNextFocus.isFocusable()

                    && userSetNextFocus.getVisibility() == View.VISIBLE
@@ -201,6 +203,14 @@ public class FocusFinder { 
                return userSetNextFocus;

            }

            userSetNextFocus = userSetNextFocus.findUserSetNextFocus(root, direction);

            if (cycleStep = !cycleStep) {

                cycleCheck = cycleCheck.findUserSetNextFocus(root, direction);

                if (cycleCheck == userSetNextFocus) {

                    // found a cycle, user-specified focus forms a loop and none of the views

                    // are currently focusable.

                    break;

                }

            }

        }

        return null;

    }