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

Commit 9599452d authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Don't cache mFirstPosition before a layoutChildren in ListView.onFocusChanged"

parents b167643c d7507834

core/java/android/widget/ListView.java

+4 −3
Original line number Original line Diff line number Diff line
@@ -3092,9 +3092,9 @@ public class ListView extends AbsListView { 
            previouslyFocusedRect.offset(mScrollX, mScrollY);

            previouslyFocusedRect.offset(mScrollX, mScrollY);





            final ListAdapter adapter = mAdapter;

            final ListAdapter adapter = mAdapter;

            final int firstPosition = mFirstPosition;

            // Don't cache the result of getChildCount or mFirstPosition here,

            // Don't cache the result of getChildCount here, it could change in layoutChildren.

            // it could change in layoutChildren.

            if (adapter.getCount() < getChildCount() + firstPosition) {

            if (adapter.getCount() < getChildCount() + mFirstPosition) {

                mLayoutMode = LAYOUT_NORMAL;

                mLayoutMode = LAYOUT_NORMAL;

                layoutChildren();

                layoutChildren();

            }

            }
@@ -3104,6 +3104,7 @@ public class ListView extends AbsListView { 
            Rect otherRect = mTempRect;

            Rect otherRect = mTempRect;

            int minDistance = Integer.MAX_VALUE;

            int minDistance = Integer.MAX_VALUE;

            final int childCount = getChildCount();

            final int childCount = getChildCount();

            final int firstPosition = mFirstPosition;





            for (int i = 0; i < childCount; i++) {

            for (int i = 0; i < childCount; i++) {

                // only consider selectable views

                // only consider selectable views