Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 788e30bd authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

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

parents 5dac2a22 2627206e

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

+2 −3
Original line number Diff line number Diff line
@@ -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);