commit f9cd258be2d572095d855fc5ceef330d7b022fc0
author Adam Cohen <adamcohen@google.com> Wed Dec 04 16:19:40 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Dec 04 16:19:40 2013 -0800
tree 0a3aa4c5b7cbca517433a0130d362e46b46ad67a
parent 0ea74f1394f17aad700bee48b4d8d1bb4a095b4d
parent 59b5c79b6ff2de83209cf1425b8924d541e97266

am 59b5c79b: Fix page jumping regression in overview mode (issue 12003672)

* commit '59b5c79b6ff2de83209cf1425b8924d541e97266':
  Fix page jumping regression in overview mode (issue 12003672)

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 2c7114b..c216f92 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1398,7 +1398,7 @@
 
                 if (finishedScrolling) {
                     mTouchState = TOUCH_STATE_REST;
-                    if (!mScroller.isFinished()) {
+                    if (!mScroller.isFinished() && !mFreeScroll) {
                         setCurrentPage(getNextPage());
                         pageEndMoving();
                     }