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

Merge "Add the missing overriden API" into nyc-dev

Browse Source
This commit is contained in:
Tenghui Zhu
2016-03-11 17:35:58 +00:00
committed by Android (Google) Code Review
parent e11936725e 1af03b1d53
commit 335875bb48
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java
View File

@@ -260,6 +260,13 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 {
return mAnimatedVectorState.mVectorDrawable.setLayoutDirection(layoutDirection); return mAnimatedVectorState.mVectorDrawable.setLayoutDirection(layoutDirection);
} }
/**
* AnimatedVectorDrawable is running on render thread now. Therefore, if the root alpha is being
* animated, then the root alpha value we get from this call could be out of sync with alpha
* value used in the render thread. Otherwise, the root alpha should be always the same value.
*
* @return the containing vector drawable's root alpha value.
*/
@Override @Override
public int getAlpha() { public int getAlpha() {
return mAnimatedVectorState.mVectorDrawable.getAlpha(); return mAnimatedVectorState.mVectorDrawable.getAlpha();
@@ -275,6 +282,11 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 {
mAnimatedVectorState.mVectorDrawable.setColorFilter(colorFilter); mAnimatedVectorState.mVectorDrawable.setColorFilter(colorFilter);
} }
@Override
public ColorFilter getColorFilter() {
return mAnimatedVectorState.mVectorDrawable.getColorFilter();
}
@Override @Override
public void setTintList(ColorStateList tint) { public void setTintList(ColorStateList tint) {
mAnimatedVectorState.mVectorDrawable.setTintList(tint); mAnimatedVectorState.mVectorDrawable.setTintList(tint);