summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-05-02 17:25:05 -0700
committerAlan Viverette <alanv@google.com>2014-05-02 17:25:05 -0700
commit40c37349390be0b3a69c8799847144a8b391a15c (patch)
treeb35a770194bc5eed36b963d5d9591235f71f85cd /graphics
parent0e82d134ee353b7d620bebdb1d39dba03989889d (diff)
downloadframeworks_base-40c37349390be0b3a69c8799847144a8b391a15c.zip
frameworks_base-40c37349390be0b3a69c8799847144a8b391a15c.tar.gz
frameworks_base-40c37349390be0b3a69c8799847144a8b391a15c.tar.bz2
Fix ripple cancel
BUG: 14495933 Change-Id: Ie3498f35705b70e4c059ff86250cef4746f174da
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/drawable/Ripple.java4
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();
}
}