diff options
| author | ztenghui <ztenghui@google.com> | 2014-06-27 12:06:48 -0700 |
|---|---|---|
| committer | ztenghui <ztenghui@google.com> | 2014-06-30 12:43:52 -0700 |
| commit | 9cb5b4c2d93acb9d6f5e14167e265c328c487d6b (patch) | |
| tree | 4c070cc42cdc6c4a438f4e870d00293429ed5533 /graphics/java | |
| parent | 66d3d8a09eb6a0238e3c189d8c3d598dc62dc0ab (diff) | |
| download | frameworks_base-9cb5b4c2d93acb9d6f5e14167e265c328c487d6b.zip frameworks_base-9cb5b4c2d93acb9d6f5e14167e265c328c487d6b.tar.gz frameworks_base-9cb5b4c2d93acb9d6f5e14167e265c328c487d6b.tar.bz2 | |
Use AnimatedVectorDrawable for progress bar.
Change-Id: I419197ef38a611757f27ca3192350ad4bd403875
Diffstat (limited to 'graphics/java')
| -rw-r--r-- | graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java | 5 | ||||
| -rw-r--r-- | graphics/java/android/graphics/drawable/VectorDrawable.java | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java index c787fb0..8560685 100644 --- a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java @@ -208,7 +208,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable { R.styleable.AnimatedVectorDrawable_drawable, 0); if (drawableRes != 0) { mAnimatedVectorState.mVectorDrawable = (VectorDrawable) res.getDrawable( - drawableRes); + drawableRes, theme); } a.recycle(); } else if (TARGET.equals(tagName)) { @@ -234,7 +234,8 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable { @Override public boolean canApplyTheme() { return super.canApplyTheme() || mAnimatedVectorState != null - && mAnimatedVectorState.canApplyTheme(); + && mAnimatedVectorState.mVectorDrawable != null + && mAnimatedVectorState.mVectorDrawable.canApplyTheme(); } @Override diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java index c98f2a1..b37204d 100644 --- a/graphics/java/android/graphics/drawable/VectorDrawable.java +++ b/graphics/java/android/graphics/drawable/VectorDrawable.java @@ -166,7 +166,7 @@ public class VectorDrawable extends Drawable { @Override public ConstantState getConstantState() { - return mVectorState; + return null; } @Override |