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

Merge "Reverse order of RT animations so enter animation works correctly"

Browse Source
This commit is contained in:
Alan Viverette
2015-08-24 21:45:43 +00:00
committed by Android (Google) Code Review
parent 135531239b 191ac0a72b
commit b197610ab0
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
graphics/java/android/graphics/drawable/RippleBackground.java
View File

@@ -131,15 +131,7 @@ class RippleBackground extends RippleComponent {
mPropX = CanvasProperty.createFloat(0);
mPropY = CanvasProperty.createFloat(0);
// Linear "fast" enter based on current opacity.
final int fastEnterDuration = (int) ((1 - mOpacity) * OPACITY_ENTER_DURATION_FAST);
if (fastEnterDuration > 0) {
final RenderNodeAnimator enter = new RenderNodeAnimator(
mPropPaint, RenderNodeAnimator.PAINT_ALPHA, targetAlpha);
enter.setInterpolator(LINEAR_INTERPOLATOR);
enter.setDuration(fastEnterDuration);
set.add(enter);
}
// Linear exit after enter is completed.
final RenderNodeAnimator exit = new RenderNodeAnimator(
@@ -149,6 +141,15 @@ class RippleBackground extends RippleComponent {
exit.setStartDelay(fastEnterDuration);
set.add(exit);
// Linear "fast" enter based on current opacity.
if (fastEnterDuration > 0) {
final RenderNodeAnimator enter = new RenderNodeAnimator(
mPropPaint, RenderNodeAnimator.PAINT_ALPHA, targetAlpha);
enter.setInterpolator(LINEAR_INTERPOLATOR);
enter.setDuration(fastEnterDuration);
set.add(enter);
}
return set;
}