commit ad7e86fbc364c8d14ff60180f2c3a413dce7b432
author Adam Cohen <adamcohen@google.com> Fri Feb 14 21:02:19 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 14 21:02:19 2014 +0000
tree fa59eb4a9289cf4b5a2fa351afe8b1c531d4a170
parent 42e306684034a2b30b2c09907d3eff0cb30d7d38
parent 94abcb984719c8a3f6a3cff14aad3d95a8c9df26

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

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