commit b2d3890df47fb9400c45226c4a3c4f4802536469
author Adam Cohen <adamcohen@google.com> Fri Feb 14 20:38:28 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 20:38:28 2014 +0000
tree 3d096fcc201e8b0f2d3305c55a044520fa2da51d
parent 6b165fa8d0d01a8e3db6bbc60e2ad79334546259
parent f9cd258be2d572095d855fc5ceef330d7b022fc0

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

* commit 'f9cd258be2d572095d855fc5ceef330d7b022fc0':
  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();
                     }