Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support theme attrs in non-stateful CSL for VD

Browse Source 
BUG: 111446567
Test: ag/4686005
Change-Id: Ic79b13b62252d6ff294984ae82aec09708c9ba68
This commit is contained in:
Doris Liu
2018-07-24 22:55:26 -07:00
parent 602542f8e0
commit 5035238d95
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/java/android/graphics/drawable/VectorDrawable.java
View File

@@ -2024,7 +2024,7 @@ public class VectorDrawable extends Drawable {
if (fillColors instanceof GradientColor) {
mFillColors = fillColors;
fillGradient = ((GradientColor) fillColors).getShader();
} else if (fillColors.isStateful()) {
} else if (fillColors.isStateful() || fillColors.canApplyTheme()) {
mFillColors = fillColors;
} else {
mFillColors = null;
@@ -2040,7 +2040,7 @@ public class VectorDrawable extends Drawable {
if (strokeColors instanceof GradientColor) {
mStrokeColors = strokeColors;
strokeGradient = ((GradientColor) strokeColors).getShader();
} else if (strokeColors.isStateful()) {
} else if (strokeColors.isStateful() || strokeColors.canApplyTheme()) {
mStrokeColors = strokeColors;
} else {
mStrokeColors = null;