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

Commit 2627206e authored by Alan Viverette's avatar Alan Viverette
Browse files

Revert "Always project ripples" 

Projecting ripples places them under shadows, which is not
ideal. Punting this workaround and waiting until we have
proper support for rounded corner clipping on windows.

This reverts commit f90b6bd5.

Change-Id: I61946649bbb1bf74a969d74e5353608afc8e4463
parent f90b6bd5

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);