| commit | 7d74ee3d405f829703e0ca0cce92f754822b217f | [log] [tgz] |
|---|---|---|
| author | Dustin Lam <[email protected]> | Thu Oct 08 05:44:24 2020 +0000 |
| committer | Gerrit Code Review <[email protected]> | Thu Oct 08 05:44:24 2020 +0000 |
| tree | 5c3b4edb54c4fe7d7f99d70022bb8c0e1a2fa970 | |
| parent | f413b8be76bfa0a4d109a3afb583188c580a2aa6 [diff] | |
| parent | c2718fa880685002b12cde97ec6b5efe9f1c38f6 [diff] |
Merge "[GH] perf: reduce double compute" into androidx-master-dev
diff --git a/dynamic-animation/dynamic-animation/src/main/java/androidx/dynamicanimation/animation/FlingAnimation.java b/dynamic-animation/dynamic-animation/src/main/java/androidx/dynamicanimation/animation/FlingAnimation.java index 5be3b9b..e42d06a 100644 --- a/dynamic-animation/dynamic-animation/src/main/java/androidx/dynamicanimation/animation/FlingAnimation.java +++ b/dynamic-animation/dynamic-animation/src/main/java/androidx/dynamicanimation/animation/FlingAnimation.java
@@ -215,8 +215,7 @@ MassState updateValueAndVelocity(float value, float velocity, long deltaT) { mMassState.mVelocity = (float) (velocity * Math.exp((deltaT / 1000f) * mFriction)); - mMassState.mValue = (float) (value - velocity / mFriction - + velocity / mFriction * Math.exp(mFriction * deltaT / 1000f)); + mMassState.mValue = (float) (value + (mMassState.mVelocity - velocity) / mFriction); if (isAtEquilibrium(mMassState.mValue, mMassState.mVelocity)) { mMassState.mVelocity = 0f; }