diff options
| author | Alan Viverette <alanv@google.com> | 2014-12-09 22:23:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-09 22:23:37 +0000 |
| commit | d3a0da9aac4c52683f59835de92840b875476380 (patch) | |
| tree | e111cac71c542794edb3a795ecb0d08ec8fbd674 /graphics | |
| parent | 2cc3d67f948c9fda8e1f801cbc872375a4a18541 (diff) | |
| parent | 5a50a8bcabdb2593b48b06854a7455318399b6d1 (diff) | |
| download | frameworks_base-d3a0da9aac4c52683f59835de92840b875476380.zip frameworks_base-d3a0da9aac4c52683f59835de92840b875476380.tar.gz frameworks_base-d3a0da9aac4c52683f59835de92840b875476380.tar.bz2 | |
am 5a50a8bc: am e615da7e: am f1792c42: Merge "Fix hotspot coordinate propagation in ViewGroup and AbsListView" into lmp-mr1-dev
* commit '5a50a8bcabdb2593b48b06854a7455318399b6d1':
Fix hotspot coordinate propagation in ViewGroup and AbsListView
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/drawable/RippleDrawable.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/drawable/RippleDrawable.java b/graphics/java/android/graphics/drawable/RippleDrawable.java index 13e3d54..9809606 100644 --- a/graphics/java/android/graphics/drawable/RippleDrawable.java +++ b/graphics/java/android/graphics/drawable/RippleDrawable.java @@ -556,11 +556,13 @@ public class RippleDrawable extends LayerDrawable { if (mRipple != null) { mRipple.cancel(); mRipple = null; + mRippleActive = false; } if (mBackground != null) { mBackground.cancel(); mBackground = null; + mBackgroundActive = false; } cancelExitingRipples(); |