Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Matching interpolator for ripple

Browse Source 
Matching the interpolators to be declerate on both enter and exit.
According to the UX team feedback.

b/63635160
Test: demo app, settings app and calculator app

Change-Id: I49b88ef73f0bd45cd2b2c26feb2443633f171575
This commit is contained in:
ztenghui
2017-10-09 16:24:21 -07:00
parent 404f23d6d0
commit 65d56ec5fe
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/java/android/graphics/drawable/RippleForeground.java
View File

@@ -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);