Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Adam Powell
2012-05-23 17:49:21 -07:00
committed by Android (Google) Code Review
parent a587b890bb 161abf3d44
commit 75ac4e8479
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/widget/AbsListView.java
View File

@@ -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;
}

4
core/java/android/widget/GridView.java
View File

@@ -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);

4
core/java/android/widget/ListView.java
View File

@@ -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);