diff options
author | Tony Wickham <twickham@google.com> | 2019-05-02 18:25:30 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-02 18:25:30 +0000 |
commit | da9cf0f66b3595518edde8e53b40b0f0c67226c4 (patch) | |
tree | 97d8259485b0eb46c46dfc250a0605efb77c2dcf /src | |
parent | ae6e318711239601fdd11a14c3cf8c542b808f19 (diff) | |
parent | 1a468145abf426ce1a5de3f14981025146c138b7 (diff) | |
download | android_packages_apps_Trebuchet-da9cf0f66b3595518edde8e53b40b0f0c67226c4.tar.gz android_packages_apps_Trebuchet-da9cf0f66b3595518edde8e53b40b0f0c67226c4.tar.bz2 android_packages_apps_Trebuchet-da9cf0f66b3595518edde8e53b40b0f0c67226c4.zip |
Merge changes I705b7a65,I98a2e71a into ub-launcher3-qt-dev
* changes:
Allow touches on launcher while animating to home
End window animation to home when handler invalidated
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher3/anim/FlingSpringAnim.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/com/android/launcher3/anim/FlingSpringAnim.java b/src/com/android/launcher3/anim/FlingSpringAnim.java index 3d21d82a2..45d49e870 100644 --- a/src/com/android/launcher3/anim/FlingSpringAnim.java +++ b/src/com/android/launcher3/anim/FlingSpringAnim.java @@ -34,6 +34,7 @@ public class FlingSpringAnim { private static final float SPRING_DAMPING = SpringForce.DAMPING_RATIO_LOW_BOUNCY; private final FlingAnimation mFlingAnim; + private SpringAnimation mSpringAnim; public <K> FlingSpringAnim(K object, FloatPropertyCompat<K> property, float startPosition, float targetPosition, float startVelocity, OnAnimationEndListener onEndListener) { @@ -44,17 +45,24 @@ public class FlingSpringAnim { .setMinValue(Math.min(startPosition, targetPosition)) .setMaxValue(Math.max(startPosition, targetPosition)); mFlingAnim.addEndListener(((animation, canceled, value, velocity) -> { - SpringAnimation springAnim = new SpringAnimation(object, property) + mSpringAnim = new SpringAnimation(object, property) .setStartVelocity(velocity) .setSpring(new SpringForce(targetPosition) .setStiffness(SPRING_STIFFNESS) .setDampingRatio(SPRING_DAMPING)); - springAnim.addEndListener(onEndListener); - springAnim.start(); + mSpringAnim.addEndListener(onEndListener); + mSpringAnim.start(); })); } public void start() { mFlingAnim.start(); } + + public void end() { + mFlingAnim.cancel(); + if (mSpringAnim.canSkipToEnd()) { + mSpringAnim.skipToEnd(); + } + } } |