commit a67d1ea0db5f536ca4a954a5f958211ec6c99992
author Winson Chung <winsonc@google.com> Thu Dec 05 00:33:30 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 05 00:33:30 2013 +0000
tree dda308a5457480cb631020220850521645f1399e
parent 59b5c79b6ff2de83209cf1425b8924d541e97266
parent c39c3c4763db748731d7c070165a2bda55ca532b

Merge "Fixing regression in drop target bar height. (Bug 11980757)" into jb-ub-now-jolly-elf

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();
                     }