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

2014-10-13 20:58:47 +00:00
parent 9ca39d744c f90b6bd54f
commit 2f82e48abb
1 changed files with 3 additions and 2 deletions
--- 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);