diff options
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(); + } + } } |