commit 732ca4642f042d04fb2ebb091bb829e33a3de3de
author Alan Viverette <alanv@google.com> Fri Mar 07 16:49:32 2014 -0800
committer Alan Viverette <alanv@google.com> Fri Mar 07 16:49:32 2014 -0800
tree 6bd7465c2b388a68a6ea898cbdd665a9154be3cc
parent 2228195452f96b312355e0e58d8c29d231ca3067

Update fast scroller item count after layoutChildren()

BUG: 12553181
Change-Id: I4ea1b45d08c153b0146868bf57884d6b8dde6245

core/java/android/widget/AbsListView.java

diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java
index 47d42dc..96a2ab5 100644
--- a/core/java/android/widget/AbsListView.java
+++ b/core/java/android/widget/AbsListView.java
@@ -2135,15 +2135,15 @@
             mRecycler.markChildrenDirty();
         }
 
-        // TODO: Move somewhere sane. This doesn't belong in onLayout().
-        if (mFastScroll != null) {
-            mFastScroll.onItemCountChanged(childCount, mItemCount);
-        }
-
         layoutChildren();
         mInLayout = false;
 
         mOverscrollMax = (b - t) / OVERSCROLL_LIMIT_DIVISOR;
+
+        // TODO: Move somewhere sane. This doesn't belong in onLayout().
+        if (mFastScroll != null) {
+            mFastScroll.onItemCountChanged(getChildCount(), mItemCount);
+        }
     }
 
     /**