diff options
| author | Alan Viverette <alanv@google.com> | 2014-05-03 00:35:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-03 00:35:24 +0000 |
| commit | 223b1e0ba7d39a91fa5acc2248341732e8c519e9 (patch) | |
| tree | ed2d1a6350fd6e9ffc1ae78f4431f00c6d2e8ddd /graphics | |
| parent | 9dfcbb840380744a051bdc4921af3127f30a2af1 (diff) | |
| parent | 40c37349390be0b3a69c8799847144a8b391a15c (diff) | |
| download | frameworks_base-223b1e0ba7d39a91fa5acc2248341732e8c519e9.zip frameworks_base-223b1e0ba7d39a91fa5acc2248341732e8c519e9.tar.gz frameworks_base-223b1e0ba7d39a91fa5acc2248341732e8c519e9.tar.bz2 | |
Merge "Fix ripple cancel"
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/drawable/Ripple.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/java/android/graphics/drawable/Ripple.java b/graphics/java/android/graphics/drawable/Ripple.java index 3446000..218a057 100644 --- a/graphics/java/android/graphics/drawable/Ripple.java +++ b/graphics/java/android/graphics/drawable/Ripple.java @@ -299,7 +299,7 @@ class Ripple { */ public void cancel() { if (mInner != null) { - mInner.end(); + mInner.cancel(); } if (mOuter != null) { @@ -307,7 +307,7 @@ class Ripple { } if (mAlpha != null) { - mAlpha.end(); + mAlpha.cancel(); } } |