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

Fix the CSL theme support inside VectorDrawable's fill and stroke

Browse Source 
b/26774249

Change-Id: I9a9fcdb0e88c4b46ab86c6b3fd780d40b96024db
(cherry picked from commit 15cc49ae52)
This commit is contained in:
Teng-Hui Zhu
2016-02-11 14:48:19 -08:00
committed by Tenghui Zhu
parent 4531e2df1d
commit f7ae8d727b
1 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1482,8 +1482,9 @@ public class VectorDrawable extends Drawable {
if (mThemeAttrs != null) {
return true;
}
boolean fillCanApplyTheme = canGradientApplyTheme(mFillColors);
boolean strokeCanApplyTheme = canGradientApplyTheme(mStrokeColors);
boolean fillCanApplyTheme = canComplexColorApplyTheme(mFillColors);
boolean strokeCanApplyTheme = canComplexColorApplyTheme(mStrokeColors);
if (fillCanApplyTheme || strokeCanApplyTheme) {
return true;
}
@@ -1493,30 +1494,42 @@ public class VectorDrawable extends Drawable {
@Override
public void applyTheme(Theme t) {
// Resolve the theme attributes directly referred by the VectorDrawable.
if (mThemeAttrs != null) {
final TypedArray a = t.resolveAttributes(mThemeAttrs, R.styleable.VectorDrawablePath);
updateStateFromTypedArray(a);
a.recycle();
}
boolean fillCanApplyTheme = canGradientApplyTheme(mFillColors);
boolean strokeCanApplyTheme = canGradientApplyTheme(mStrokeColors);
// Resolve the theme attributes in-directly referred by the VectorDrawable, for example,
// fillColor can refer to a color state list which itself needs to apply theme.
// And this is the reason we still want to keep partial update for the path's properties.
boolean fillCanApplyTheme = canComplexColorApplyTheme(mFillColors);
boolean strokeCanApplyTheme = canComplexColorApplyTheme(mStrokeColors);
if (fillCanApplyTheme) {
mFillColors = mFillColors.obtainForTheme(t);
nUpdateFullPathFillGradient(mNativePtr,
((GradientColor)mFillColors).getShader().getNativeInstance());
if (mFillColors instanceof GradientColor) {
nUpdateFullPathFillGradient(mNativePtr,
((GradientColor) mFillColors).getShader().getNativeInstance());
} else if (mFillColors instanceof ColorStateList) {
nSetFillColor(mNativePtr, mFillColors.getDefaultColor());
}
}
if (strokeCanApplyTheme) {
mStrokeColors = mStrokeColors.obtainForTheme(t);
nUpdateFullPathStrokeGradient(mNativePtr,
((GradientColor)mStrokeColors).getShader().getNativeInstance());
if (mStrokeColors instanceof GradientColor) {
nUpdateFullPathStrokeGradient(mNativePtr,
((GradientColor) mStrokeColors).getShader().getNativeInstance());
} else if (mStrokeColors instanceof ColorStateList) {
nSetStrokeColor(mNativePtr, mStrokeColors.getDefaultColor());
}
}
}
private boolean canGradientApplyTheme(ComplexColor complexColor) {
return complexColor != null && complexColor.canApplyTheme()
&& complexColor instanceof GradientColor;
private boolean canComplexColorApplyTheme(ComplexColor complexColor) {
return complexColor != null && complexColor.canApplyTheme();
}
/* Setters and Getters, used by animator from AnimatedVectorDrawable. */