diff options
-rw-r--r-- | src/com/android/launcher3/PagedView.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 8181bea4f..3e2ec5857 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -1368,10 +1368,13 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc */ 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; |