Fixing regression in paging

Change-Id: I9a76448aa09aea6a86a8a97860e48113c222a205

1 files changed, 8 insertions, 6 deletions

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 788ccfa2a..6af20a2f0 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -528,11 +528,13 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
         forceFinishScroller();
     }
 
-    private void abortScrollerAnimation() {
+    private void abortScrollerAnimation(boolean resetNextPage) {
         mScroller.abortAnimation();
         // We need to clean up the next page here to avoid computeScrollHelper from
         // updating current page on the pass.
-        mNextPage = INVALID_PAGE;
+        if (resetNextPage) {
+            mNextPage = INVALID_PAGE;
+        }
     }
 
     private void forceFinishScroller() {
@@ -547,7 +549,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
      */
     void setCurrentPage(int currentPage) {
         if (!mScroller.isFinished()) {
-            abortScrollerAnimation();
+            abortScrollerAnimation(true);
         }
         // don't introduce any checks like mCurrentPage == currentPage here-- if we change the
         // the default
@@ -1473,7 +1475,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
                 final boolean finishedScrolling = (mScroller.isFinished() || xDist < mTouchSlop);
                 if (finishedScrolling) {
                     mTouchState = TOUCH_STATE_REST;
-                    abortScrollerAnimation();
+                    abortScrollerAnimation(false);
                 } else {
                     if (isTouchPointInViewportWithBuffer((int) mDownMotionX, (int) mDownMotionY)) {
                         mTouchState = TOUCH_STATE_SCROLLING;
@@ -1768,7 +1770,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
              * will be false if being flinged.
              */
             if (!mScroller.isFinished()) {
-                abortScrollerAnimation();
+                abortScrollerAnimation(false);
             }
 
             // Remember where the motion event started
@@ -1966,7 +1968,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
                     }
                 } else {
                     if (!mScroller.isFinished()) {
-                        abortScrollerAnimation();
+                        abortScrollerAnimation(true);
                     }
 
                     float scaleX = getScaleX();