From 2627206e1b1658ccade3669d1794dc0d90e36264 Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Mon, 13 Oct 2014 23:18:04 +0000
Subject: [PATCH] Revert "Always project ripples"

Projecting ripples places them under shadows, which is not
ideal. Punting this workaround and waiting until we have
proper support for rounded corner clipping on windows.

This reverts commit f90b6bd54f60960a790b5bd507a0d75d961a981a.

Change-Id: I61946649bbb1bf74a969d74e5353608afc8e4463
---
 graphics/java/android/graphics/drawable/RippleDrawable.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/graphics/java/android/graphics/drawable/RippleDrawable.java b/graphics/java/android/graphics/drawable/RippleDrawable.java
index f14ccd46d7c02..54e1daebfafd1 100644
--- a/graphics/java/android/graphics/drawable/RippleDrawable.java
+++ b/graphics/java/android/graphics/drawable/RippleDrawable.java
@@ -348,8 +348,7 @@ public class RippleDrawable extends LayerDrawable {
      */
     @Override
     public boolean isProjected() {
-        // Always project ripples. We'll handle bounding in draw().
-        return true;
+        return getNumberOfLayers() == 0;
     }
 
     @Override
@@ -852,7 +851,7 @@ public class RippleDrawable extends LayerDrawable {
 
     @Override
     public Rect getDirtyBounds() {
-        if (getNumberOfLayers() == 0) {
+        if (isProjected()) {
             final Rect drawingBounds = mDrawingBounds;
             final Rect dirtyBounds = mDirtyBounds;
             dirtyBounds.set(drawingBounds);