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

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

Merge "Fix a bug with deferred position scrolling in lists while data changes... 

Merge "Fix a bug with deferred position scrolling in lists while data changes are pending" into jb-dev
parents a587b890 161abf3d

core/java/android/widget/AbsListView.java

+8 −6
Original line number Diff line number Diff line
@@ -579,6 +579,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
    private InputConnectionWrapper mPublicInputConnection;



    private Runnable mClearScrollingCache;

    Runnable mPositionScrollAfterLayout;

    private int mMinimumVelocity;

    private int mMaximumVelocity;

    private float mVelocityScale = 1.0f;
@@ -1910,6 +1911,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
        removeAllViewsInLayout();

        mFirstPosition = 0;

        mDataChanged = false;

        mPositionScrollAfterLayout = null;

        mNeedSync = false;

        mOldSelectedPosition = INVALID_POSITION;

        mOldSelectedRowId = INVALID_ROW_ID;
@@ -4248,11 +4250,11 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 


            if (mDataChanged) {

                // Wait until we're back in a stable state to try this.

                post(new Runnable() {

                mPositionScrollAfterLayout = new Runnable() {

                    @Override public void run() {

                        start(position);

                    }

                });

                };

                return;

            }
@@ -4299,11 +4301,11 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 


            if (mDataChanged) {

                // Wait until we're back in a stable state to try this.

                post(new Runnable() {

                mPositionScrollAfterLayout = new Runnable() {

                    @Override public void run() {

                        start(position, boundPosition);

                    }

                });

                };

                return;

            }
@@ -4376,11 +4378,11 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
            if (mDataChanged) {

                // Wait until we're back in a stable state to try this.

                final int postOffset = offset;

                post(new Runnable() {

                mPositionScrollAfterLayout = new Runnable() {

                    @Override public void run() {

                        startWithOffset(position, postOffset, duration);

                    }

                });

                };

                return;

            }

core/java/android/widget/GridView.java

+4 −0
Original line number Diff line number Diff line
@@ -1275,6 +1275,10 @@ public class GridView extends AbsListView { 


            mLayoutMode = LAYOUT_NORMAL;

            mDataChanged = false;

            if (mPositionScrollAfterLayout != null) {

                post(mPositionScrollAfterLayout);

                mPositionScrollAfterLayout = null;

            }

            mNeedSync = false;

            setNextSelectedPositionInt(mSelectedPosition);

core/java/android/widget/ListView.java

+4 −0
Original line number Diff line number Diff line
@@ -1691,6 +1691,10 @@ public class ListView extends AbsListView { 
            

            mLayoutMode = LAYOUT_NORMAL;

            mDataChanged = false;

            if (mPositionScrollAfterLayout != null) {

                post(mPositionScrollAfterLayout);

                mPositionScrollAfterLayout = null;

            }

            mNeedSync = false;

            setNextSelectedPositionInt(mSelectedPosition);