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

Commit d4c4d946 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

Change-Id: I60a5a5901a2eeb787d4750819130ded347808f8a
parents 7fd09024 cf893ac4

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

+9 −0
Original line number Diff line number Diff line
@@ -295,6 +295,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) {