From 5035238d95dcbe487dd08f11804829de9615bc1b Mon Sep 17 00:00:00 2001 From: Doris Liu Date: Tue, 24 Jul 2018 22:55:26 -0700 Subject: Support theme attrs in non-stateful CSL for VD BUG: 111446567 Test: ag/4686005 Change-Id: Ic79b13b62252d6ff294984ae82aec09708c9ba68 --- graphics/java/android/graphics/drawable/VectorDrawable.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'graphics/java/android') diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java index b5bd97f74d84..932203eb19b2 100644 --- a/graphics/java/android/graphics/drawable/VectorDrawable.java +++ b/graphics/java/android/graphics/drawable/VectorDrawable.java @@ -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; -- cgit v1.2.3-59-g8ed1b