diff options
author | Adam Cohen <adamcohen@google.com> | 2013-10-02 06:58:34 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-02 06:58:34 -0700 |
commit | f8eb28cd64411c813e294c8c595d5fb0f24bf734 (patch) | |
tree | c0ac6e074d0455a15c9d9307dc8ec667bff62151 | |
parent | bff515401d3542abdaf50983ca00e0baefe4db12 (diff) | |
parent | 6957a8d7112fd2f9d9df9cb51376b3fc67230d06 (diff) | |
download | android_packages_apps_Trebuchet-f8eb28cd64411c813e294c8c595d5fb0f24bf734.tar.gz android_packages_apps_Trebuchet-f8eb28cd64411c813e294c8c595d5fb0f24bf734.tar.bz2 android_packages_apps_Trebuchet-f8eb28cd64411c813e294c8c595d5fb0f24bf734.zip |
am 6957a8d7: am 044db335: Merge "Making sure overview mode can\'t get stuck (issue 11022017)" into jb-ub-now-indigo-rose
* commit '6957a8d7112fd2f9d9df9cb51376b3fc67230d06':
Making sure overview mode can't get stuck (issue 11022017)
-rw-r--r-- | src/com/android/launcher3/PagedView.java | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 0a15ecd62..6d7501865 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -990,13 +990,14 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc // in accordance with any scroll effects. mForceScreenScrolled = true; mRecomputePageSpacing = true; - + updateFreescrollBounds(); invalidate(); } @Override public void onChildViewRemoved(View parent, View child) { mForceScreenScrolled = true; + updateFreescrollBounds(); invalidate(); } @@ -1558,6 +1559,17 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc setEnableFreeScroll(false, snapPage); } + void updateFreescrollBounds() { + getOverviewModePages(mTempVisiblePagesRange); + if (isLayoutRtl()) { + mFreeScrollMinScrollX = getScrollForPage(mTempVisiblePagesRange[1]); + mFreeScrollMaxScrollX = getScrollForPage(mTempVisiblePagesRange[0]); + } else { + mFreeScrollMinScrollX = getScrollForPage(mTempVisiblePagesRange[0]); + mFreeScrollMaxScrollX = getScrollForPage(mTempVisiblePagesRange[1]); + } + } + private void setEnableFreeScroll(boolean freeScroll, int snapPage) { mFreeScroll = freeScroll; @@ -1565,18 +1577,11 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc snapPage = getPageNearestToCenterOfScreen(); } - getOverviewModePages(mTempVisiblePagesRange); if (!mFreeScroll) { snapToPage(snapPage); } else { - if (isLayoutRtl()) { - mFreeScrollMinScrollX = getScrollForPage(mTempVisiblePagesRange[1]); - mFreeScrollMaxScrollX = getScrollForPage(mTempVisiblePagesRange[0]); - } else { - mFreeScrollMinScrollX = getScrollForPage(mTempVisiblePagesRange[0]); - mFreeScrollMaxScrollX = getScrollForPage(mTempVisiblePagesRange[1]); - } - + updateFreescrollBounds(); + getOverviewModePages(mTempVisiblePagesRange); if (getCurrentPage() < mTempVisiblePagesRange[0]) { setCurrentPage(mTempVisiblePagesRange[0]); } else if (getCurrentPage() > mTempVisiblePagesRange[1]) { |