diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-11-08 07:29:13 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-08 07:29:13 -0800 |
| commit | 4683041885e6a8338dc3111a9e3f15cc7c62611e (patch) | |
| tree | 03412a6640fa5090a67ae9f3125332f5b3837927 /src/com/android/launcher3/PagedView.java | |
| parent | d7adbab669f922e02193eaf819ce32518dc70e8d (diff) | |
| parent | 2da0a0532752fae8985e3e8a192eb5087cf78aab (diff) | |
| download | android_packages_apps_Trebuchet-4683041885e6a8338dc3111a9e3f15cc7c62611e.tar.gz android_packages_apps_Trebuchet-4683041885e6a8338dc3111a9e3f15cc7c62611e.tar.bz2 android_packages_apps_Trebuchet-4683041885e6a8338dc3111a9e3f15cc7c62611e.zip | |
am 2da0a053: Fix small scrolling regression
* commit '2da0a0532752fae8985e3e8a192eb5087cf78aab':
Fix small scrolling regression
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 a85065e79..7b5662523 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; |