diff options
| author | Alan Viverette <alanv@google.com> | 2014-12-11 00:32:53 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-11 00:32:53 +0000 |
| commit | 7d0aed2d2c0c2fd4bcaa0e786efd6134ae162d07 (patch) | |
| tree | 27ac8117a92b181c7231a66b2f1bf258debdc53f /graphics | |
| parent | 4e4fd0f7216cefa9a7e010625bd5b2375277bcdc (diff) | |
| parent | c211857af37eabb6073fa2ac402c9f7de9548822 (diff) | |
| download | frameworks_base-7d0aed2d2c0c2fd4bcaa0e786efd6134ae162d07.zip frameworks_base-7d0aed2d2c0c2fd4bcaa0e786efd6134ae162d07.tar.gz frameworks_base-7d0aed2d2c0c2fd4bcaa0e786efd6134ae162d07.tar.bz2 | |
am 4e137437: Merge "Update tint filter after setting gradient drawable state" into lmp-mr1-dev
automerge: c211857
* commit 'c211857af37eabb6073fa2ac402c9f7de9548822':
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 12b707b..5533d5e 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); } } |