diff options
author | Adam Cohen <adamcohen@google.com> | 2013-11-18 20:06:55 +0000 |
---|---|---|
committer | Danesh M <daneshm90@gmail.com> | 2014-06-06 22:54:19 -0700 |
commit | 8c50bdfebce831d4037ebbfe344d355e233da56e (patch) | |
tree | 3776f67701f6679739b1dc05696407491725aee8 /src | |
parent | 384ca1056819542000ddc5726f0e62f56cc17b6e (diff) | |
download | android_packages_apps_Trebuchet-8c50bdfebce831d4037ebbfe344d355e233da56e.tar.gz android_packages_apps_Trebuchet-8c50bdfebce831d4037ebbfe344d355e233da56e.tar.bz2 android_packages_apps_Trebuchet-8c50bdfebce831d4037ebbfe344d355e233da56e.zip |
Allowing ability to pick up items / enter overview before full page settle
-> Fixes issue 11701996
-> Fixes issue where if you tried to longpress a widget before the page
settled, it would instead enter overview
Change-Id: Ic6321805687dd5e8c69506c6cd6941a11d557ed6
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/PagedView.java | 11 | ||||
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 1 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index b11302c9a..9c9a514f1 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -151,7 +151,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc protected int mTouchState = TOUCH_STATE_REST; protected boolean mForceScreenScrolled = false; - private boolean mScrollAbortedFromIntercept = false; protected OnLongClickListener mLongClickListener; @@ -1496,13 +1495,13 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc * being flinged. */ final int xDist = Math.abs(mScroller.getFinalX() - mScroller.getCurrX()); - final boolean finishedScrolling = (mScroller.isFinished() || xDist < mTouchSlop); + final boolean finishedScrolling = (mScroller.isFinished() || xDist < mTouchSlop / 3); if (finishedScrolling) { mTouchState = TOUCH_STATE_REST; if (!mScroller.isFinished()) { - mScrollAbortedFromIntercept = true; - abortScrollerAnimation(false); + setCurrentPage(getNextPage()); + pageEndMoving(); } } else { if (isTouchPointInViewportWithBuffer((int) mDownMotionX, (int) mDownMotionY)) { @@ -1530,9 +1529,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc case MotionEvent.ACTION_UP: case MotionEvent.ACTION_CANCEL: - if (mScrollAbortedFromIntercept) { - snapToDestination(); - } resetTouchState(); break; @@ -2101,7 +2097,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc releaseVelocityTracker(); endReordering(); mCancelTap = false; - mScrollAbortedFromIntercept = false; mTouchState = TOUCH_STATE_REST; mActivePointerId = INVALID_POINTER; } diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 7ba6adf2a..f54695c32 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2239,7 +2239,6 @@ public class Workspace extends SmoothPagedView enableFreeScroll(); } - if (state != State.NORMAL) { if (stateIsSpringLoaded) { mNewScale = mSpringLoadedShrinkFactor; |