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

Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev

Browse Source
This commit is contained in:
Phil Weaver
2016-11-02 17:13:22 +00:00
committed by Android (Google) Code Review
parent e319e7335c 866ded50bb
commit 7ffc2a62ff
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2160,6 +2160,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
} }
layoutChildren(); layoutChildren();
mInLayout = false;
mOverscrollMax = (b - t) / OVERSCROLL_LIMIT_DIVISOR; mOverscrollMax = (b - t) / OVERSCROLL_LIMIT_DIVISOR;
@@ -2167,7 +2168,6 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
if (mFastScroll != null) { if (mFastScroll != null) {
mFastScroll.onItemCountChanged(getChildCount(), mItemCount); mFastScroll.onItemCountChanged(getChildCount(), mItemCount);
} }
mInLayout = false;
} }
/** /**
@@ -2697,9 +2697,6 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
* fail to relayout them properly to accommodate for new bounds. * fail to relayout them properly to accommodate for new bounds.
*/ */
void handleBoundsChange() { void handleBoundsChange() {
if (mInLayout) {
return;
}
final int childCount = getChildCount(); final int childCount = getChildCount();
if (childCount > 0) { if (childCount > 0) {
mDataChanged = true; mDataChanged = true;