From f90b6bd54f60960a790b5bd507a0d75d961a981a Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Thu, 9 Oct 2014 14:47:19 -0700
Subject: [PATCH] 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
---
 graphics/java/android/graphics/drawable/RippleDrawable.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/graphics/java/android/graphics/drawable/RippleDrawable.java b/graphics/java/android/graphics/drawable/RippleDrawable.java
index 54e1daebfafd1..f14ccd46d7c02 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);