diff options
author | Adam Cohen <adamcohen@google.com> | 2013-10-01 11:07:24 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2013-10-01 11:19:44 -0700 |
commit | 97d5311e2a84a9ece018ff9593be2c0012ccb223 (patch) | |
tree | 6931e998d86251f5fc6e3f995216839f913a5bee | |
parent | 61f560d92ab4b11a61beeb8df97b9952027e08e4 (diff) | |
download | android_packages_apps_Trebuchet-97d5311e2a84a9ece018ff9593be2c0012ccb223.tar.gz android_packages_apps_Trebuchet-97d5311e2a84a9ece018ff9593be2c0012ccb223.tar.bz2 android_packages_apps_Trebuchet-97d5311e2a84a9ece018ff9593be2c0012ccb223.zip |
Ensuring that snapToPage is completely aborted / cleaned up upon setCurrentPage (issue 11003904)
Change-Id: Iba851c297ab9406b094c8f0cbf6e39675d0ffa39
-rw-r--r-- | src/com/android/launcher3/PagedView.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 41687d383..0a15ecd62 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -518,6 +518,9 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc void setCurrentPage(int currentPage) { if (!mScroller.isFinished()) { mScroller.abortAnimation(); + // We need to clean up the next page here to avoid computeScrollHelper from + // updating current page on the pass. + mNextPage = INVALID_PAGE; } // don't introduce any checks like mCurrentPage == currentPage here-- if we change the // the default |