commit ee5b470b341be0908333a1ae03f323d0b614e032
author Adam Cohen <adamcohen@google.com> Wed Oct 02 06:58:15 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 02 06:58:15 2013 -0700
tree f9160f653ba7863e11c1b9a490f915d6c2262fec
parent d40b2e993f9e200081b3f9a3b06ca9dc7cccb94e
parent b8f7475c32627a53bf23b914cd904b4f2e9dff57

am b8f7475c: am e269ca42: Merge "Ensuring that snapToPage is completely aborted / cleaned up upon setCurrentPage (issue 11003904)" into jb-ub-now-indigo-rose

* commit 'b8f7475c32627a53bf23b914cd904b4f2e9dff57':
  Ensuring that snapToPage is completely aborted / cleaned up upon setCurrentPage (issue 11003904)

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 41687d3..0a15ecd 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -518,6 +518,9 @@
     void setCurrentPage(int currentPage) {
         if (!mScroller.isFinished()) {
             mScroller.abortAnimation();
+            // We need to clean up the next page here to avoid computeScrollHelper from
+            // updating current page on the pass.
+            mNextPage = INVALID_PAGE;
         }
         // don't introduce any checks like mCurrentPage == currentPage here-- if we change the
         // the default