diff options
| author | 2017-10-10 01:15:49 +0000 | |
|---|---|---|
| committer | 2017-10-10 01:15:49 +0000 | |
| commit | 721c108d8f3d10c36cf4707e8f5cf09fafbf822d (patch) | |
| tree | 65a536bfff2dc46f06b8798937ac884c68e8230c | |
| parent | a2f041fb9f79fd1baff0b0bf2a41d252f9b714f0 (diff) | |
| parent | 65d56ec5fef1a4777a4b66c54fe6f387403bc220 (diff) | |
Merge "Matching interpolator for ripple"
| -rw-r--r-- | graphics/java/android/graphics/drawable/RippleForeground.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/java/android/graphics/drawable/RippleForeground.java b/graphics/java/android/graphics/drawable/RippleForeground.java index ed417b97bbeb..a675eaf85297 100644 --- a/graphics/java/android/graphics/drawable/RippleForeground.java +++ b/graphics/java/android/graphics/drawable/RippleForeground.java @@ -169,13 +169,13 @@ class RippleForeground extends RippleComponent { final ObjectAnimator tweenRadius = ObjectAnimator.ofFloat(this, TWEEN_RADIUS, 1); tweenRadius.setAutoCancel(true); tweenRadius.setDuration(duration); - tweenRadius.setInterpolator(LINEAR_INTERPOLATOR); + tweenRadius.setInterpolator(DECELERATE_INTERPOLATOR); tweenRadius.setStartDelay(RIPPLE_ENTER_DELAY); final ObjectAnimator tweenOrigin = ObjectAnimator.ofFloat(this, TWEEN_ORIGIN, 1); tweenOrigin.setAutoCancel(true); tweenOrigin.setDuration(duration); - tweenOrigin.setInterpolator(LINEAR_INTERPOLATOR); + tweenOrigin.setInterpolator(DECELERATE_INTERPOLATOR); tweenOrigin.setStartDelay(RIPPLE_ENTER_DELAY); final ObjectAnimator opacity = ObjectAnimator.ofFloat(this, OPACITY, 1); |