diff options
| author | Alan Viverette <alanv@google.com> | 2014-12-11 00:29:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-11 00:29:51 +0000 |
| commit | c211857af37eabb6073fa2ac402c9f7de9548822 (patch) | |
| tree | e99b1945cbe612741fc6ddaf3eed033744b953a9 /graphics | |
| parent | b4854456c0e9092900a6432eb90d7c552c029070 (diff) | |
| parent | 4e1374378d41f15cefc1f5889fd4d549461485ff (diff) | |
| download | frameworks_base-c211857af37eabb6073fa2ac402c9f7de9548822.zip frameworks_base-c211857af37eabb6073fa2ac402c9f7de9548822.tar.gz frameworks_base-c211857af37eabb6073fa2ac402c9f7de9548822.tar.bz2 | |
am 4e137437: Merge "Update tint filter after setting gradient drawable state" into lmp-mr1-dev
* commit '4e1374378d41f15cefc1f5889fd4d549461485ff':
Update tint filter after setting gradient drawable state
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/drawable/GradientDrawable.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java index 94c7026..48fea46 100644 --- a/graphics/java/android/graphics/drawable/GradientDrawable.java +++ b/graphics/java/android/graphics/drawable/GradientDrawable.java @@ -1795,5 +1795,7 @@ public class GradientDrawable extends Drawable { mStrokePaint.setPathEffect(e); } } + + mTintFilter = updateTintFilter(mTintFilter, s.mTint, s.mTintMode); } } |