From b2b02b9bd2e0b0da7373125c06f6d67d9758d8fe Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Wed, 10 Jun 2015 18:40:05 -0700 Subject: Fix a small UI nit with screen reordering -> When in overview mode, flinging the pages can leave the scroller running (invisibly) for much additional time, since the scroller fling bounds far exceed the alloawble scroll bounds (in order to achieve a hard wall type effect) -> When this is happening, user couldn't pick up a page for reordering -> Ended the scroller early in this case to avoid the problem Change-Id: I8b6f140d9a87bb742e57625e90ca7d76a2158e28 --- src/com/android/launcher3/PagedView.java | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src') diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 18832c680..4a85b448f 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -567,6 +567,13 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc public void scrollTo(int x, int y) { // In free scroll mode, we clamp the scrollX if (mFreeScroll) { + // If the scroller is trying to move to a location beyond the maximum allowed + // in the free scroll mode, we make sure to end the scroll operation. + if (!mScroller.isFinished() && + (x > mFreeScrollMaxScrollX || x < mFreeScrollMinScrollX)) { + forceFinishScroller(); + } + x = Math.min(x, mFreeScrollMaxScrollX); x = Math.max(x, mFreeScrollMinScrollX); } -- cgit v1.2.3