diff options
Diffstat (limited to 'src/com/android/launcher3/PagedView.java')
| -rw-r--r-- | src/com/android/launcher3/PagedView.java | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index bb79c2c40..2c7114bc5 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; @@ -1395,13 +1394,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)) { @@ -1429,9 +1428,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc case MotionEvent.ACTION_UP: case MotionEvent.ACTION_CANCEL: - if (mScrollAbortedFromIntercept) { - snapToDestination(); - } resetTouchState(); break; @@ -2000,7 +1996,6 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc releaseVelocityTracker(); endReordering(); mCancelTap = false; - mScrollAbortedFromIntercept = false; mTouchState = TOUCH_STATE_REST; mActivePointerId = INVALID_POINTER; } |