diff options
author | Adam Cohen <adamcohen@google.com> | 2013-11-18 20:06:55 +0000 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2013-11-18 20:08:11 +0000 |
commit | a765215280ef9e128da3fbab37b3d51a565941e3 (patch) | |
tree | bfb79b855c42c5864f3e3fe19a28b8ddacc7b238 /src/com | |
parent | f9618856d6910ac385ad37762f9f067ae59a8622 (diff) | |
download | android_packages_apps_Trebuchet-a765215280ef9e128da3fbab37b3d51a565941e3.tar.gz android_packages_apps_Trebuchet-a765215280ef9e128da3fbab37b3d51a565941e3.tar.bz2 android_packages_apps_Trebuchet-a765215280ef9e128da3fbab37b3d51a565941e3.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/com')
-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 c85449809..370c629a3 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -153,7 +153,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; @@ -1392,13 +1391,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)) { @@ -1426,9 +1425,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc case MotionEvent.ACTION_UP: case MotionEvent.ACTION_CANCEL: - if (mScrollAbortedFromIntercept) { - snapToDestination(); - } resetTouchState(); break; @@ -1997,7 +1993,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 8602606fe..4d72852ea 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2113,7 +2113,6 @@ public class Workspace extends SmoothPagedView enableFreeScroll(); } - if (state != State.NORMAL) { if (stateIsSpringLoaded) { mNewScale = mSpringLoadedShrinkFactor; |