diff options
author | Adam Cohen <adamcohen@google.com> | 2013-10-29 22:27:42 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-29 22:27:43 +0000 |
commit | c53d77c7b0e3c78655953869169f418057724873 (patch) | |
tree | 8cecbe1aa1a8c6d71bd03669120ff19499873d52 | |
parent | 619a180be5a67f5bcd7021d300bd35e8b5296e7f (diff) | |
parent | 8bdbaab8e67d33e3eeece0aa5b893014444c3be8 (diff) | |
download | android_packages_apps_Trebuchet-c53d77c7b0e3c78655953869169f418057724873.tar.gz android_packages_apps_Trebuchet-c53d77c7b0e3c78655953869169f418057724873.tar.bz2 android_packages_apps_Trebuchet-c53d77c7b0e3c78655953869169f418057724873.zip |
Merge "Fixing regression in paging" into jb-ub-now-jetsonic
-rw-r--r-- | src/com/android/launcher3/PagedView.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 3ff987393..1fee4c23d 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -519,11 +519,13 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc forceFinishScroller(); } - private void abortScrollerAnimation() { + private void abortScrollerAnimation(boolean resetNextPage) { mScroller.abortAnimation(); // We need to clean up the next page here to avoid computeScrollHelper from // updating current page on the pass. - mNextPage = INVALID_PAGE; + if (resetNextPage) { + mNextPage = INVALID_PAGE; + } } private void forceFinishScroller() { @@ -538,7 +540,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc */ void setCurrentPage(int currentPage) { if (!mScroller.isFinished()) { - abortScrollerAnimation(); + abortScrollerAnimation(true); } // don't introduce any checks like mCurrentPage == currentPage here-- if we change the // the default @@ -1372,7 +1374,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc final boolean finishedScrolling = (mScroller.isFinished() || xDist < mTouchSlop); if (finishedScrolling) { mTouchState = TOUCH_STATE_REST; - abortScrollerAnimation(); + abortScrollerAnimation(false); } else { if (isTouchPointInViewportWithBuffer((int) mDownMotionX, (int) mDownMotionY)) { mTouchState = TOUCH_STATE_SCROLLING; @@ -1671,7 +1673,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc * will be false if being flinged. */ if (!mScroller.isFinished()) { - abortScrollerAnimation(); + abortScrollerAnimation(false); } // Remember where the motion event started @@ -1869,7 +1871,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc } } else { if (!mScroller.isFinished()) { - abortScrollerAnimation(); + abortScrollerAnimation(true); } float scaleX = getScaleX(); |