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

Commit dba97ba1 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Made the DrawableWrapper return the right ColorFilter" into pi-dev am: cf893ac4 

am: d4c4d946

Change-Id: I064ead2161ed1c1a0b91141fdf828eb6c9d7ce1d
parents 3ebda730 d4c4d946

graphics/java/android/graphics/drawable/DrawableWrapper.java

+9 −0
Original line number Diff line number Diff line
@@ -306,6 +306,15 @@ public abstract class DrawableWrapper extends Drawable implements Drawable.Callb 
        }

    }



    @Override

    public ColorFilter getColorFilter() {

        final Drawable drawable = getDrawable();

        if (drawable != null) {

            return drawable.getColorFilter();

        }

        return super.getColorFilter();

    }



    @Override

    public void setTintList(@Nullable ColorStateList tint) {

        if (mDrawable != null) {