diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-10-09 18:57:02 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2013-10-10 12:51:44 -0700 |
| commit | 21cd002fef13ff0b6336f10f97e29738a2b0ecb9 (patch) | |
| tree | d36bc94c8b734d5121528c12c46e8da0d0dd9741 /src/com/android/launcher3/PagedView.java | |
| parent | 82e5c98446e1f1765aabca1725cba181a56edcb4 (diff) | |
| download | android_packages_apps_Trebuchet-21cd002fef13ff0b6336f10f97e29738a2b0ecb9.tar.gz android_packages_apps_Trebuchet-21cd002fef13ff0b6336f10f97e29738a2b0ecb9.tar.bz2 android_packages_apps_Trebuchet-21cd002fef13ff0b6336f10f97e29738a2b0ecb9.zip | |
Fix issue where custom content would show up on boot (issue 10713745)
Change-Id: I1c03784970fe1a88e2561f1c5367979cda825973
Diffstat (limited to 'src/com/android/launcher3/PagedView.java')
| -rw-r--r-- | src/com/android/launcher3/PagedView.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 2a339c039..e982985f1 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -97,6 +97,8 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc private static final boolean DISABLE_TOUCH_SIDE_PAGES = true; private static final boolean DISABLE_FLING_TO_DELETE = true; + public static final int INVALID_RESTORE_PAGE = -1001; + private boolean mFreeScroll = false; private int mFreeScrollMinScrollX = -1; private int mFreeScrollMaxScrollX = -1; @@ -115,7 +117,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc private int mNormalChildHeight; protected int mCurrentPage; - protected int mRestorePage = -1; + protected int mRestorePage = INVALID_RESTORE_PAGE; protected int mChildCountOnLastLayout; protected int mNextPage = INVALID_PAGE; @@ -546,7 +548,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc if (getChildCount() == 0) { return; } - mForceScreenScrolled = true; mCurrentPage = Math.max(0, Math.min(currentPage, getPageCount() - 1)); updateCurrentPageScroll(); @@ -982,9 +983,9 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc if (mScroller.isFinished() && mChildCountOnLastLayout != getChildCount() && !mDeferringForDelete) { - if (mRestorePage > -1) { + if (mRestorePage != INVALID_RESTORE_PAGE) { setCurrentPage(mRestorePage); - mRestorePage = -1; + mRestorePage = INVALID_RESTORE_PAGE; } else { setCurrentPage(getNextPage()); } |