diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-10-01 18:21:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-01 18:21:12 +0000 |
| commit | e269ca4298eb4be7c4e07bfb67cfb7dcf38c274f (patch) | |
| tree | f9160f653ba7863e11c1b9a490f915d6c2262fec | |
| parent | 1970614d0980699a6858a098dd1e13e65664ab47 (diff) | |
| parent | 97d5311e2a84a9ece018ff9593be2c0012ccb223 (diff) | |
| download | android_packages_apps_Trebuchet-e269ca4298eb4be7c4e07bfb67cfb7dcf38c274f.tar.gz android_packages_apps_Trebuchet-e269ca4298eb4be7c4e07bfb67cfb7dcf38c274f.tar.bz2 android_packages_apps_Trebuchet-e269ca4298eb4be7c4e07bfb67cfb7dcf38c274f.zip | |
Merge "Ensuring that snapToPage is completely aborted / cleaned up upon setCurrentPage (issue 11003904)" into jb-ub-now-indigo-rose
| -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 |