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

Merge "Implement AnimatedImageDrawable.getColorFilter"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-02-20 17:04:14 +00:00
committed by Android (Google) Code Review
parent ff43d08eb0 8ed124d57e
commit 75c515effa
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
graphics/java/android/graphics/drawable/AnimatedImageDrawable.java
View File

@@ -83,6 +83,8 @@ public class AnimatedImageDrawable extends Drawable implements Animatable2 {
private Runnable mRunnable;
private ColorFilter mColorFilter;
/**
* Pass this to {@link #setLoopCount} to loop infinitely.
*
@@ -276,9 +278,18 @@ public class AnimatedImageDrawable extends Drawable implements Animatable2 {
throw new IllegalStateException("called setColorFilter on empty AnimatedImageDrawable");
}
long nativeFilter = colorFilter == null ? 0 : colorFilter.getNativeInstance();
nSetColorFilter(mState.mNativePtr, nativeFilter);
invalidateSelf();
if (colorFilter != mColorFilter) {
mColorFilter = colorFilter;
long nativeFilter = colorFilter == null ? 0 : colorFilter.getNativeInstance();
nSetColorFilter(mState.mNativePtr, nativeFilter);
invalidateSelf();
}
}
@Override
@Nullable
public ColorFilter getColorFilter() {
return mColorFilter;
}
@Override