summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-10-09 14:47:19 -0700
committerAlan Viverette <alanv@google.com>2014-10-09 14:47:19 -0700
commitf90b6bd54f60960a790b5bd507a0d75d961a981a (patch)
tree1b6e57b650e8af2677c7346db7802fc8e422b35c /graphics
parent19a9e6c23b44e4fbee2f559e921170e34732d858 (diff)
downloadframeworks_base-f90b6bd54f60960a790b5bd507a0d75d961a981a.zip
frameworks_base-f90b6bd54f60960a790b5bd507a0d75d961a981a.tar.gz
frameworks_base-f90b6bd54f60960a790b5bd507a0d75d961a981a.tar.bz2
Always project ripples
We already handle bounding rect in draw(), so this just ensures that ripples are always clipped to window background outlines until we can implement more general clipping. BUG: 17498583 Change-Id: Iaff51fb177b017a11822bdf4f31c117fc9522c15
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/drawable/RippleDrawable.java5
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);