Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6bdfbc9 authored by Doris Liu's avatar Doris Liu Committed by Android (Google) Code Review
Browse files

Merge "Support theme attrs in non-stateful CSL for VD"

parents 08dd510f 5035238d

graphics/java/android/graphics/drawable/VectorDrawable.java

+2 −2
Original line number Diff line number Diff line
@@ -2033,7 +2033,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;
@@ -2049,7 +2049,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;