diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2017-05-08 19:22:53 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-08 19:22:53 +0000 |
commit | d822c8401b7428a42ef382902deee87c0546d71f (patch) | |
tree | a26f3415b860899a76cad81db47d3fb4d65b6087 | |
parent | 47db4a9c01d2f7b467d9d79a81c1bff9b10d4765 (diff) | |
parent | e9fcc71967c50ac942877cfa4dddce8ffd18e3e6 (diff) | |
download | android_packages_apps_Trebuchet-d822c8401b7428a42ef382902deee87c0546d71f.tar.gz android_packages_apps_Trebuchet-d822c8401b7428a42ef382902deee87c0546d71f.tar.bz2 android_packages_apps_Trebuchet-d822c8401b7428a42ef382902deee87c0546d71f.zip |
Merge "Disabling page fling while the overlay is moving" into ub-launcher3-dorval-polish
am: e9fcc71967
Change-Id: I24288a0d6d38abc3fea7b43c0bfae5ced83c3427
-rw-r--r-- | src/com/android/launcher3/PagedView.java | 6 | ||||
-rw-r--r-- | src/com/android/launcher3/Workspace.java | 7 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java index 31e3dda32..255677a53 100644 --- a/src/com/android/launcher3/PagedView.java +++ b/src/com/android/launcher3/PagedView.java @@ -1599,7 +1599,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc mTotalMotionX += Math.abs(mLastMotionX + mLastMotionXRemainder - x); boolean isFling = mTotalMotionX > MIN_LENGTH_FOR_FLING && - Math.abs(velocityX) > mFlingThresholdVelocity; + shouldFlingForVelocity(velocityX); if (!mFreeScroll) { // In the case that the page is moved far to one direction and then is flung @@ -1705,6 +1705,10 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc return true; } + protected boolean shouldFlingForVelocity(int velocityX) { + return Math.abs(velocityX) > mFlingThresholdVelocity; + } + private void resetTouchState() { releaseVelocityTracker(); endReordering(); diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index dd2daca57..ead1a9f83 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -1462,6 +1462,13 @@ public class Workspace extends PagedView } } + @Override + protected boolean shouldFlingForVelocity(int velocityX) { + // When the overlay is moving, the fling or settle transition is controlled by the overlay. + return Float.compare(mOverlayTranslation, 0) == 0 && + super.shouldFlingForVelocity(velocityX); + } + private final Interpolator mAlphaInterpolator = new DecelerateInterpolator(3f); /** |