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

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

Merge "Always apply color filter passed to DrawableContainer.setColorFilter"

parents bbcec733 6f51440a

graphics/java/android/graphics/drawable/DrawableContainer.java

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback { 


    @Override

    public void setColorFilter(ColorFilter cf) {

        mDrawableContainerState.mHasColorFilter = (cf != null);

        mDrawableContainerState.mHasColorFilter = true;



        if (mDrawableContainerState.mColorFilter != cf) {

            mDrawableContainerState.mColorFilter = cf;