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 am: ff25528a9b

Browse Source 
am: 2962a7bae6

* commit '2962a7bae64cbffa78d9fcef382aa98ee841aaa2':
  Do not invalidate drawable if tint doesn't change
This commit is contained in:
Jorim Jaggi
2016-02-10 09:25:27 +00:00
committed by android-build-merger
parent 0bb2084ed6 2962a7bae6
commit 424dde093a
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
public void setTintList(ColorStateList tint) {
mBitmapState.mTint = tint;
mTintFilter = updateTintFilter(mTintFilter, tint, mBitmapState.mTintMode);
invalidateSelf();
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;
mTintFilter = updateTintFilter(mTintFilter, mBitmapState.mTint, tintMode);
invalidateSelf();
final BitmapState state = mBitmapState;
if (state.mTintMode != tintMode) {
state.mTintMode = tintMode;
mTintFilter = updateTintFilter(mTintFilter, mBitmapState.mTint, tintMode);
invalidateSelf();
}
}
/**