commit b767166b3ab8c18d277271167c390c8eb2088302
author Adam Cohen <adamcohen@google.com> Fri Nov 08 07:32:01 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 08 07:32:01 2013 -0800
tree d0bedabe4f9718729120a3f00ee6e00fa34802b3
parent 98e011b40aa886065f75398fec19bff7f0d7e5c5
parent 4683041885e6a8338dc3111a9e3f15cc7c62611e

am 46830418: am 2da0a053: Fix small scrolling regression

* commit '4683041885e6a8338dc3111a9e3f15cc7c62611e':
  Fix small scrolling regression

src/com/android/launcher3/PagedView.java

diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index a85065e..7b56625 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -1368,10 +1368,13 @@
                  */
                 final int xDist = Math.abs(mScroller.getFinalX() - mScroller.getCurrX());
                 final boolean finishedScrolling = (mScroller.isFinished() || xDist < mTouchSlop);
+
                 if (finishedScrolling) {
                     mTouchState = TOUCH_STATE_REST;
-                    mScrollAbortedFromIntercept = true;
-                    abortScrollerAnimation(false);
+                    if (!mScroller.isFinished()) {
+                        mScrollAbortedFromIntercept = true;
+                        abortScrollerAnimation(false);
+                    }
                 } else {
                     if (isTouchPointInViewportWithBuffer((int) mDownMotionX, (int) mDownMotionY)) {
                         mTouchState = TOUCH_STATE_SCROLLING;