diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-11-08 06:28:17 -0800 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2013-11-08 06:30:18 -0800 |
| commit | 2da0a0532752fae8985e3e8a192eb5087cf78aab (patch) | |
| tree | 7f2d18bfa7e99a95072cb07736f50daaa827e584 /src/com/android/launcher3/PagedView.java | |
| parent | a1648449901178da191564a0dd9ecbdf9f971e69 (diff) | |
| download | android_packages_apps_Trebuchet-2da0a0532752fae8985e3e8a192eb5087cf78aab.tar.gz android_packages_apps_Trebuchet-2da0a0532752fae8985e3e8a192eb5087cf78aab.tar.bz2 android_packages_apps_Trebuchet-2da0a0532752fae8985e3e8a192eb5087cf78aab.zip | |
Fix small scrolling regression
-> only cancel scrolling when necessary to avoid
unnecessary snapToDestination() calls
Change-Id: I406bef2453c88d61d25f66be67205ab8fbd69ec9
Diffstat (limited to 'src/com/android/launcher3/PagedView.java')
| -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; |