diff options
author | Jonathan Miranda <jonmiranda@google.com> | 2021-09-23 23:14:50 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-09-23 23:14:50 +0000 |
commit | e2455aa1cf550f3ef65197d82b134a77ab883ae8 (patch) | |
tree | 454fc8684ea8be8a0d213e53a684cc3c30444388 /src/com/android/launcher3/anim | |
parent | 768e686466d6f0306e5dd781ae87d7a5dd8927b4 (diff) | |
parent | 13519e44029022db37743e9340750a6117f32729 (diff) | |
download | Launcher3-e2455aa1cf550f3ef65197d82b134a77ab883ae8.tar.gz |
Merge "Significantly reduce gesture feedback when swiping up to home screen." into sc-v2-dev
Diffstat (limited to 'src/com/android/launcher3/anim')
-rw-r--r-- | src/com/android/launcher3/anim/FlingSpringAnim.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/launcher3/anim/FlingSpringAnim.java b/src/com/android/launcher3/anim/FlingSpringAnim.java index 6ea38ec8ab..51eab4c386 100644 --- a/src/com/android/launcher3/anim/FlingSpringAnim.java +++ b/src/com/android/launcher3/anim/FlingSpringAnim.java @@ -40,8 +40,8 @@ public class FlingSpringAnim { private float mTargetPosition; public <K> FlingSpringAnim(K object, Context context, FloatPropertyCompat<K> property, - float startPosition, float targetPosition, float startVelocity, float minVisChange, - float minValue, float maxValue, float springVelocityFactor, + float startPosition, float targetPosition, float startVelocityPxPerS, + float minVisChange, float minValue, float maxValue, OnAnimationEndListener onEndListener) { ResourceProvider rp = DynamicResource.provider(context); float damping = rp.getFloat(R.dimen.swipe_up_rect_xy_damping_ratio); @@ -53,19 +53,19 @@ public class FlingSpringAnim { // Have the spring pull towards the target if we've slowed down too much before // reaching it. .setMinimumVisibleChange(minVisChange) - .setStartVelocity(startVelocity) + .setStartVelocity(startVelocityPxPerS) .setMinValue(minValue) .setMaxValue(maxValue); mTargetPosition = targetPosition; // We are already past the fling target, so skip it to avoid losing a frame of the spring. - mSkipFlingAnim = startPosition <= minValue && startVelocity < 0 - || startPosition >= maxValue && startVelocity > 0; + mSkipFlingAnim = startPosition <= minValue && startVelocityPxPerS < 0 + || startPosition >= maxValue && startVelocityPxPerS > 0; mFlingAnim.addEndListener(((animation, canceled, value, velocity) -> { mSpringAnim = new SpringAnimation(object, property) .setStartValue(value) - .setStartVelocity(velocity * springVelocityFactor) + .setStartVelocity(velocity) .setSpring(new SpringForce(mTargetPosition) .setStiffness(stiffness) .setDampingRatio(damping)); |