diff options
author | linyuh <linyuh@google.com> | 2017-12-27 17:02:37 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2017-12-27 17:03:47 -0800 |
commit | 183cb71663320f16149d83eeebaff7795a4b55f2 (patch) | |
tree | bc8bfcce809257b3ddbb423a9808082292b9f6a3 /java/com/android/incallui/answer/impl/utils/FlingAnimationUtils.java | |
parent | fc81a030a7b4f6d4a497f71aed593d398795e7da (diff) |
Remove field prefixes.
Test: Existing tests
PiperOrigin-RevId: 180230450
Change-Id: I0b2589cfeeaef81e42a04efa48af24b4e4d0e95f
Diffstat (limited to 'java/com/android/incallui/answer/impl/utils/FlingAnimationUtils.java')
-rw-r--r-- | java/com/android/incallui/answer/impl/utils/FlingAnimationUtils.java | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/java/com/android/incallui/answer/impl/utils/FlingAnimationUtils.java b/java/com/android/incallui/answer/impl/utils/FlingAnimationUtils.java index 3acb2a205..baec30819 100644 --- a/java/com/android/incallui/answer/impl/utils/FlingAnimationUtils.java +++ b/java/com/android/incallui/answer/impl/utils/FlingAnimationUtils.java @@ -41,7 +41,7 @@ public class FlingAnimationUtils { private float maxLengthSeconds; private float highVelocityPxPerSecond; - private AnimatorProperties mAnimatorProperties = new AnimatorProperties(); + private AnimatorProperties animatorProperties = new AnimatorProperties(); public FlingAnimationUtils(Context ctx, float maxLengthSeconds) { this.maxLengthSeconds = maxLengthSeconds; @@ -127,23 +127,23 @@ public class FlingAnimationUtils { float velAbs = Math.abs(velocity); float durationSeconds = LINEAR_OUT_SLOW_IN_START_GRADIENT * diff / velAbs; if (durationSeconds <= maxLengthSeconds) { - mAnimatorProperties.interpolator = linearOutSlowIn; + animatorProperties.interpolator = linearOutSlowIn; } else if (velAbs >= minVelocityPxPerSecond) { // Cross fade between fast-out-slow-in and linear interpolator with current velocity. durationSeconds = maxLengthSeconds; VelocityInterpolator velocityInterpolator = new VelocityInterpolator(durationSeconds, velAbs, diff); - mAnimatorProperties.interpolator = + animatorProperties.interpolator = new InterpolatorInterpolator(velocityInterpolator, linearOutSlowIn, linearOutSlowIn); } else { // Just use a normal interpolator which doesn't take the velocity into account. durationSeconds = maxLengthSeconds; - mAnimatorProperties.interpolator = Interpolators.FAST_OUT_SLOW_IN; + animatorProperties.interpolator = Interpolators.FAST_OUT_SLOW_IN; } - mAnimatorProperties.duration = (long) (durationSeconds * 1000); - return mAnimatorProperties; + animatorProperties.duration = (long) (durationSeconds * 1000); + return animatorProperties; } /** @@ -203,7 +203,7 @@ public class FlingAnimationUtils { Interpolator mLinearOutFasterIn = new PathInterpolator(0, 0, LINEAR_OUT_FASTER_IN_X2, y2); float durationSeconds = startGradient * diff / velAbs; if (durationSeconds <= maxLengthSeconds) { - mAnimatorProperties.interpolator = mLinearOutFasterIn; + animatorProperties.interpolator = mLinearOutFasterIn; } else if (velAbs >= minVelocityPxPerSecond) { // Cross fade between linear-out-faster-in and linear interpolator with current @@ -213,15 +213,15 @@ public class FlingAnimationUtils { new VelocityInterpolator(durationSeconds, velAbs, diff); InterpolatorInterpolator superInterpolator = new InterpolatorInterpolator(velocityInterpolator, mLinearOutFasterIn, linearOutSlowIn); - mAnimatorProperties.interpolator = superInterpolator; + animatorProperties.interpolator = superInterpolator; } else { // Just use a normal interpolator which doesn't take the velocity into account. durationSeconds = maxLengthSeconds; - mAnimatorProperties.interpolator = Interpolators.FAST_OUT_LINEAR_IN; + animatorProperties.interpolator = Interpolators.FAST_OUT_LINEAR_IN; } - mAnimatorProperties.duration = (long) (durationSeconds * 1000); - return mAnimatorProperties; + animatorProperties.duration = (long) (durationSeconds * 1000); + return animatorProperties; } /** @@ -246,42 +246,42 @@ public class FlingAnimationUtils { /** An interpolator which interpolates two interpolators with an interpolator. */ private static final class InterpolatorInterpolator implements Interpolator { - private Interpolator mInterpolator1; - private Interpolator mInterpolator2; - private Interpolator mCrossfader; + private Interpolator interpolator1; + private Interpolator interpolator2; + private Interpolator crossfader; InterpolatorInterpolator( Interpolator interpolator1, Interpolator interpolator2, Interpolator crossfader) { - mInterpolator1 = interpolator1; - mInterpolator2 = interpolator2; - mCrossfader = crossfader; + this.interpolator1 = interpolator1; + this.interpolator2 = interpolator2; + this.crossfader = crossfader; } @Override public float getInterpolation(float input) { - float t = mCrossfader.getInterpolation(input); - return (1 - t) * mInterpolator1.getInterpolation(input) - + t * mInterpolator2.getInterpolation(input); + float t = crossfader.getInterpolation(input); + return (1 - t) * interpolator1.getInterpolation(input) + + t * interpolator2.getInterpolation(input); } } /** An interpolator which interpolates with a fixed velocity. */ private static final class VelocityInterpolator implements Interpolator { - private float mDurationSeconds; - private float mVelocity; - private float mDiff; + private float durationSeconds; + private float velocity; + private float diff; private VelocityInterpolator(float durationSeconds, float velocity, float diff) { - mDurationSeconds = durationSeconds; - mVelocity = velocity; - mDiff = diff; + this.durationSeconds = durationSeconds; + this.velocity = velocity; + this.diff = diff; } @Override public float getInterpolation(float input) { - float time = input * mDurationSeconds; - return time * mVelocity / mDiff; + float time = input * durationSeconds; + return time * velocity / diff; } } |