Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: ff25528a9b

* commit 'ff25528a9beaa33a4effbe90c3d3fc259c0d3aa8':
  Do not invalidate drawable if tint doesn't change
This commit is contained in:
Jorim Jaggi
2016-02-10 06:23:13 +00:00
committed by android-build-merger
parent ff82588a13 ff25528a9b
commit 2962a7bae6
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
graphics/java/android/graphics/drawable/BitmapDrawable.java
View File

@@ -641,16 +641,22 @@ public class BitmapDrawable extends Drawable {
@Override @Override
public void setTintList(ColorStateList tint) { public void setTintList(ColorStateList tint) {
mBitmapState.mTint = tint; final BitmapState state = mBitmapState;
mTintFilter = updateTintFilter(mTintFilter, tint, mBitmapState.mTintMode); if (state.mTint != tint) {
invalidateSelf(); state.mTint = tint;
mTintFilter = updateTintFilter(mTintFilter, tint, mBitmapState.mTintMode);
invalidateSelf();
}
} }
@Override @Override
public void setTintMode(PorterDuff.Mode tintMode) { public void setTintMode(PorterDuff.Mode tintMode) {
mBitmapState.mTintMode = tintMode; final BitmapState state = mBitmapState;
mTintFilter = updateTintFilter(mTintFilter, mBitmapState.mTint, tintMode); if (state.mTintMode != tintMode) {
invalidateSelf(); state.mTintMode = tintMode;
mTintFilter = updateTintFilter(mTintFilter, mBitmapState.mTint, tintMode);
invalidateSelf();
}
} }
/** /**