diff options
| author | Alan Viverette <alanv@google.com> | 2013-12-16 17:55:08 -0800 |
|---|---|---|
| committer | Alan Viverette <alanv@google.com> | 2013-12-16 17:55:08 -0800 |
| commit | 083f5518d73e15d70ceb5c0cbc1370eda1928252 (patch) | |
| tree | bb7ae692850c735742fb8eb8cc21c40fd1cb35c7 /graphics/java | |
| parent | 0dadf4d03072c1e0d5ad67edcb35ec1bd48496dc (diff) | |
| download | frameworks_base-083f5518d73e15d70ceb5c0cbc1370eda1928252.zip frameworks_base-083f5518d73e15d70ceb5c0cbc1370eda1928252.tar.gz frameworks_base-083f5518d73e15d70ceb5c0cbc1370eda1928252.tar.bz2 | |
Fix stroke color in GradientState.initializeWithState()
BUG: 12175674
Change-Id: I084339fd3c31a9b49f5875c9d3bac8f50cd027ca
Diffstat (limited to 'graphics/java')
| -rw-r--r-- | graphics/java/android/graphics/drawable/GradientDrawable.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java index d4799e6..75184e0 100644 --- a/graphics/java/android/graphics/drawable/GradientDrawable.java +++ b/graphics/java/android/graphics/drawable/GradientDrawable.java @@ -1446,7 +1446,14 @@ public class GradientDrawable extends Drawable { mStrokePaint = new Paint(Paint.ANTI_ALIAS_FLAG); mStrokePaint.setStyle(Paint.Style.STROKE); mStrokePaint.setStrokeWidth(state.mStrokeWidth); - mStrokePaint.setColor(state.mStrokeColor); + if (state.mStrokeColorStateList != null) { + final int[] currentState = getState(); + final int strokeStateColor = state.mStrokeColorStateList.getColorForState( + currentState, 0); + mStrokePaint.setColor(strokeStateColor); + } else { + mStrokePaint.setColor(state.mStrokeColor); + } if (state.mStrokeDashWidth != 0.0f) { DashPathEffect e = new DashPathEffect( |