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

Improve docs for drawable tint and color filters

Browse Source 
bug:19564477
Change-Id: I7e11baae2d4dd245965904c85b8855de71f6b6ac
This commit is contained in:
Chris Craik
2015-03-02 10:43:29 -08:00
parent 3062e57072
commit bd3bfc5285
20 changed files with 111 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
graphics/java/android/graphics/drawable/DrawableContainer.java
View File

@@ -172,14 +172,14 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
}
@Override
public void setColorFilter(ColorFilter cf) {
public void setColorFilter(ColorFilter colorFilter) {
mDrawableContainerState.mHasColorFilter = true;
if (mDrawableContainerState.mColorFilter != cf) {
mDrawableContainerState.mColorFilter = cf;
if (mDrawableContainerState.mColorFilter != colorFilter) {
mDrawableContainerState.mColorFilter = colorFilter;
if (mCurrDrawable != null) {
mCurrDrawable.mutate().setColorFilter(cf);
mCurrDrawable.mutate().setColorFilter(colorFilter);
}
}
}