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

Commit 6c01bf5f authored by Yabin Huang's avatar Yabin Huang
Browse files

Revert "Update FocusFinder" 

Revert submission 11830696-b/158492287-stage-aosp-rvc-ts-dev

Reason for revert: It's too late to merge this CL to rvc-dev. Let's revert it and merge it to rvc-qpr-dev.
Reverted Changes:
Ib5c1854d1:Update FocusFinder

Change-Id: I5f50166322b662b457e1b79b2ce62c622ddd1013
parent 713af5fd

core/java/android/view/FocusFinder.java

+8 −11
Original line number Diff line number Diff line
@@ -311,9 +311,6 @@ public class FocusFinder { 
        }



        final int count = focusables.size();

        if (count < 2) {

            return null;

        }

        switch (direction) {

            case View.FOCUS_FORWARD:

                return getNextFocusable(focused, focusables, count);
@@ -376,30 +373,30 @@ public class FocusFinder { 
    }



    private static View getNextFocusable(View focused, ArrayList<View> focusables, int count) {

        if (count < 2) {

            return null;

        }

        if (focused != null) {

            int position = focusables.lastIndexOf(focused);

            if (position >= 0 && position + 1 < count) {

                return focusables.get(position + 1);

            }

        }

        if (!focusables.isEmpty()) {

            return focusables.get(0);

        }



    private static View getPreviousFocusable(View focused, ArrayList<View> focusables, int count) {

        if (count < 2) {

        return null;

    }



    private static View getPreviousFocusable(View focused, ArrayList<View> focusables, int count) {

        if (focused != null) {

            int position = focusables.indexOf(focused);

            if (position > 0) {

                return focusables.get(position - 1);

            }

        }

        if (!focusables.isEmpty()) {

            return focusables.get(count - 1);

        }

        return null;

    }



    private static View getNextKeyboardNavigationCluster(

            View root,