diff options
| author | Alan Viverette <alanv@google.com> | 2015-02-24 01:22:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-24 01:22:17 +0000 |
| commit | 32adbd3524210c20ba794751f390befaffefd212 (patch) | |
| tree | 539d76129afe88bcb0967a1013d4837874a16238 /graphics | |
| parent | bbcec73309809869bb28db9b6ef05b6b8118cb0c (diff) | |
| parent | 6f51440a746ef4925ec329cd3a71a9689be2b10b (diff) | |
| download | frameworks_base-32adbd3524210c20ba794751f390befaffefd212.zip frameworks_base-32adbd3524210c20ba794751f390befaffefd212.tar.gz frameworks_base-32adbd3524210c20ba794751f390befaffefd212.tar.bz2 | |
Merge "Always apply color filter passed to DrawableContainer.setColorFilter"
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/drawable/DrawableContainer.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java index 70693f2..c4794d9 100644 --- a/graphics/java/android/graphics/drawable/DrawableContainer.java +++ b/graphics/java/android/graphics/drawable/DrawableContainer.java @@ -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; |