am db8ecf80: am 788e30bd: Merge "Revert "Always project ripples"" into lmp-mr1-dev

* commit 'db8ecf8005294833a9fe758e5e4a4d6fd100bd66': Revert "Always project ripples"
2014-10-14 17:50:27 +00:00
parent 11dd7cab3b db8ecf8005
commit b50d158605
1 changed files with 2 additions and 3 deletions
--- 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);