diff options
author | Alan Viverette <alanv@google.com> | 2014-06-03 22:44:33 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-03 22:49:33 +0000 |
commit | bd4d1c31f3bcee427f6664d4002f4d111083647f (patch) | |
tree | 6ad5073d9b2a00c704013ae9d15a48cfd483757d /graphics | |
parent | 3ad30bf6d8e3b1a6d7047022ec545f6cfe9f43f2 (diff) | |
parent | 840ff809628127f026620ed127d7f8e134a75e63 (diff) | |
download | frameworks_base-bd4d1c31f3bcee427f6664d4002f4d111083647f.zip frameworks_base-bd4d1c31f3bcee427f6664d4002f4d111083647f.tar.gz frameworks_base-bd4d1c31f3bcee427f6664d4002f4d111083647f.tar.bz2 |
Merge "Set starting value on ripple exit animation" into lmp-preview-dev
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/java/android/graphics/drawable/Ripple.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/drawable/Ripple.java b/graphics/java/android/graphics/drawable/Ripple.java index ada741b..55d01ed 100644 --- a/graphics/java/android/graphics/drawable/Ripple.java +++ b/graphics/java/android/graphics/drawable/Ripple.java @@ -408,6 +408,7 @@ class Ripple { outerFadeOutAnim.setDuration(outerDuration); outerFadeOutAnim.setInterpolator(LINEAR_INTERPOLATOR); outerFadeOutAnim.setStartDelay(outerInflection); + outerFadeOutAnim.setStartValue(inflectionOpacity); outerFadeOutAnim.addListener(mAnimationListener); mPendingAnimations.add(outerFadeOutAnim); |