commit accfd5648ccb3a3248b422a8c1971b7de8d3207b
author Adam Cohen <adamcohen@google.com> Fri Jul 12 14:40:40 2013 -0700
committer Adam Cohen <adamcohen@google.com> Fri Jul 12 14:41:21 2013 -0700
tree 5701b39222bc55d405c06d870181d563bf29aabd
parent dedbd962dcfaf055a6835abf5b0000ce1564e51e

Fix weird page jumps after dropping items

Change-Id: I9f5063d2a9db9e2f2a5c2fd183b45884da11dacc

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index cc9a075..275195b 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -652,7 +652,6 @@
 
         // We measure the dimensions of the PagedView to be larger than the pages so that when we
         // zoom out (and scale down), the view is still contained in the parent
-        View parent = (View) getParent();
         int widthMode = MeasureSpec.getMode(widthMeasureSpec);
         int widthSize = MeasureSpec.getSize(widthMeasureSpec);
         int heightMode = MeasureSpec.getMode(heightMeasureSpec);
@@ -727,8 +726,9 @@
         // ensure that the cache is filled with good values.
         invalidateCachedOffsets();
 
-        if (mChildCountOnLastMeasure != getChildCount() && !mDeferringForDelete) {
-            setCurrentPage(mCurrentPage);
+        if (mScroller.isFinished() && mChildCountOnLastMeasure != getChildCount() &&
+                !mDeferringForDelete) {
+            setCurrentPage(getNextPage());
         }
         mChildCountOnLastMeasure = getChildCount();