diff options
author | Adam Cohen <adamcohen@google.com> | 2013-11-25 18:46:23 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-25 18:46:23 +0000 |
commit | cccfe95beb2de07fb3aef19e99e975e3a01cd055 (patch) | |
tree | 5715296e0505aef3fa516e63de9252b52c75f0ae | |
parent | 5b3bdd394e4401d7e91d528ef1d424d1af271d97 (diff) | |
parent | a765215280ef9e128da3fbab37b3d51a565941e3 (diff) | |
download | android_packages_apps_Trebuchet-cccfe95beb2de07fb3aef19e99e975e3a01cd055.tar.gz android_packages_apps_Trebuchet-cccfe95beb2de07fb3aef19e99e975e3a01cd055.tar.bz2 android_packages_apps_Trebuchet-cccfe95beb2de07fb3aef19e99e975e3a01cd055.zip |
Merge "Allowing ability to pick up items / enter overview before full page settle" into jb-ub-now-jolly-elf
-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 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; } diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index f8db240e0..ba28dcfca 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -2114,7 +2114,6 @@ public class Workspace extends SmoothPagedView enableFreeScroll(); } - if (state != State.NORMAL) { if (stateIsSpringLoaded) { mNewScale = mSpringLoadedShrinkFactor; |