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

Commit 2962a7ba authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Do not invalidate drawable if tint doesn\'t change" into nyc-dev 

am: ff25528a

* commit 'ff25528a':
  Do not invalidate drawable if tint doesn't change
parents ff82588a ff25528a

graphics/java/android/graphics/drawable/BitmapDrawable.java

+12 −6
Original line number Diff line number Diff line
@@ -641,17 +641,23 @@ public class BitmapDrawable extends Drawable { 


    @Override

    public void setTintList(ColorStateList tint) {

        mBitmapState.mTint = tint;

        final BitmapState state = mBitmapState;

        if (state.mTint != tint) {

            state.mTint = tint;

            mTintFilter = updateTintFilter(mTintFilter, tint, mBitmapState.mTintMode);

            invalidateSelf();

        }

    }



    @Override

    public void setTintMode(PorterDuff.Mode tintMode) {

        mBitmapState.mTintMode = tintMode;

        final BitmapState state = mBitmapState;

        if (state.mTintMode != tintMode) {

            state.mTintMode = tintMode;

            mTintFilter = updateTintFilter(mTintFilter, mBitmapState.mTint, tintMode);

            invalidateSelf();

        }

    }



    /**

     * @hide only needed by a hack within ProgressBar