commit 788e30bd34b575e029d6b55d74e9c81ce28b21df
author Alan Viverette <alanv@google.com> Tue Oct 14 00:37:02 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 14 00:37:03 2014 +0000
tree 23d5a32d3a9e1a04d90028f22247dff16d57a7c1
parent 5dac2a225e54e0fc4cbddb81e7e11c6296c579b3
parent 2627206e1b1658ccade3669d1794dc0d90e36264

Merge "Revert "Always project ripples"" into lmp-mr1-dev

graphics/java/android/graphics/drawable/RippleDrawable.java

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