diff options
| author | Alan Viverette <alanv@google.com> | 2015-02-23 17:21:24 -0800 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2015-02-23 17:21:24 -0800 |
| commit | 6f51440a746ef4925ec329cd3a71a9689be2b10b (patch) | |
| tree | 77053a969a8bf978739225e1c6a67beabe83da74 /graphics | |
| parent | b3f3762ee0f57c94ea25bc1cc9d4baf0ee2a2976 (diff) | |
| download | frameworks_base-6f51440a746ef4925ec329cd3a71a9689be2b10b.zip frameworks_base-6f51440a746ef4925ec329cd3a71a9689be2b10b.tar.gz frameworks_base-6f51440a746ef4925ec329cd3a71a9689be2b10b.tar.bz2 | |
Always apply color filter passed to DrawableContainer.setColorFilter
Bug: 19461256
Change-Id: Id44d276739b868e504139cdf767992039f3e4336
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; |