diff options
| author | Alan Viverette <alanv@google.com> | 2014-10-13 20:58:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-13 20:58:48 +0000 |
| commit | 2f82e48abb71c92e41caa8057e3068dbfe96ed62 (patch) | |
| tree | 0993a3f484b7af2486f8b3908f2fa1b520add7bd /graphics | |
| parent | 9ca39d744cdf6ffdb782bbc883b2f4266545f64e (diff) | |
| parent | f90b6bd54f60960a790b5bd507a0d75d961a981a (diff) | |
| download | frameworks_base-2f82e48abb71c92e41caa8057e3068dbfe96ed62.zip frameworks_base-2f82e48abb71c92e41caa8057e3068dbfe96ed62.tar.gz frameworks_base-2f82e48abb71c92e41caa8057e3068dbfe96ed62.tar.bz2 | |
Merge "Always project ripples" into lmp-mr1-dev
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/drawable/RippleDrawable.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/graphics/java/android/graphics/drawable/RippleDrawable.java b/graphics/java/android/graphics/drawable/RippleDrawable.java index 54e1dae..f14ccd4 100644 --- a/graphics/java/android/graphics/drawable/RippleDrawable.java +++ b/graphics/java/android/graphics/drawable/RippleDrawable.java @@ -348,7 +348,8 @@ public class RippleDrawable extends LayerDrawable { */ @Override public boolean isProjected() { - return getNumberOfLayers() == 0; + // Always project ripples. We'll handle bounding in draw(). + return true; } @Override @@ -851,7 +852,7 @@ public class RippleDrawable extends LayerDrawable { @Override public Rect getDirtyBounds() { - if (isProjected()) { + if (getNumberOfLayers() == 0) { final Rect drawingBounds = mDrawingBounds; final Rect dirtyBounds = mDirtyBounds; dirtyBounds.set(drawingBounds); |