summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/Workspace.java
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2017-05-08 09:17:42 -0700
committerSunny Goyal <sunnygoyal@google.com>2017-05-08 12:10:32 -0700
commit65d9ceb383c95c125b7faae4d7c32215f1ccb573 (patch)
tree64e3404a2b26891f9bcd35f09c1b43de09a3b395 /src/com/android/launcher3/Workspace.java
parent0e261d56a79a7aed15877e5018a22c369964571f (diff)
downloadandroid_packages_apps_Trebuchet-65d9ceb383c95c125b7faae4d7c32215f1ccb573.tar.gz
android_packages_apps_Trebuchet-65d9ceb383c95c125b7faae4d7c32215f1ccb573.tar.bz2
android_packages_apps_Trebuchet-65d9ceb383c95c125b7faae4d7c32215f1ccb573.zip
Disabling page fling while the overlay is moving
Bug: 37959201 Change-Id: I2278a46d10bc81855e10f97e669460e0d0b93daa
Diffstat (limited to 'src/com/android/launcher3/Workspace.java')
-rw-r--r--src/com/android/launcher3/Workspace.java7
1 files changed, 7 insertions, 0 deletions
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);
/**