commit 6f351bcc7c9a1835ce7fa7852a2b4fdcde41c1bf
author Alan Viverette <alanv@google.com> Mon Oct 13 21:12:43 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 13 21:12:43 2014 +0000
tree eef44e1b87a894bccbfbd74091922dee5d21e298
parent 200ee78fe65843cc8ef4d0675697c0486878a35c
parent 2776b17327e99338630db96d68170b0327084b3d

am 2776b173: am 204e9f4c: am 2f82e48a: Merge "Always project ripples" into lmp-mr1-dev

* commit '2776b17327e99338630db96d68170b0327084b3d':
  Always project ripples

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