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

am c12f46eb: am 5db566f1: Fix updating fast scroll state for data set changes

Browse Source 
* commit 'c12f46ebb9f93016ef11511a3e8038718a016beb':
  Fix updating fast scroll state for data set changes
This commit is contained in:
Adam Powell
2013-10-13 19:04:50 -07:00
committed by Android Git Automerger
parent 59cd8d70dc c12f46ebb9
commit 5d96f61a92
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2084,8 +2084,8 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
mRecycler.markChildrenDirty();
}
if (mFastScroller != null && mItemCount != mOldItemCount) {
mFastScroller.onItemCountChanged(mOldItemCount, mItemCount);
if (mFastScroller != null && (mItemCount != mOldItemCount || mDataChanged)) {
mFastScroller.onItemCountChanged(mItemCount);
}
layoutChildren();

6
core/java/android/widget/FastScroller.java
View File

@@ -441,7 +441,7 @@ class FastScroller {
updateLayout();
}
public void onItemCountChanged(int oldTotalItemCount, int totalItemCount) {
public void onItemCountChanged(int totalItemCount) {
final int visibleItemCount = mList.getChildCount();
final boolean hasMoreItems = totalItemCount - visibleItemCount > 0;
if (hasMoreItems && mState != STATE_DRAGGING) {
@@ -1095,12 +1095,14 @@ class FastScroller {
final float thumbMiddle = position * range + offset;
thumbImage.setTranslationY(thumbMiddle - thumbImage.getHeight() / 2);
final float previewPos = mOverlayPosition == OVERLAY_AT_THUMB ? thumbMiddle : 0;
// Center the preview on the thumb, constrained to the list bounds.
final ImageView previewImage = mPreviewImage;
final float previewHalfHeight = previewImage.getHeight() / 2f;
final float minP = top + previewHalfHeight;
final float maxP = bottom - previewHalfHeight;
final float previewMiddle = MathUtils.constrain(thumbMiddle, minP, maxP);
final float previewMiddle = MathUtils.constrain(previewPos, minP, maxP);
final float previewTop = previewMiddle - previewHalfHeight;
previewImage.setTranslationY(previewTop);

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

@@ -508,7 +508,6 @@ public class ListView extends AbsListView {
requestLayout();
}
/**
* The list is empty. Clear everything out.
*/