Merge "Implement AnimatedImageDrawable.getColorFilter" (75c515ef) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/drawable/AnimatedImageDrawable.java

+14 −3

Original line number	Diff line number	Diff line
		@@ -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,10 +278,19 @@ public class AnimatedImageDrawable extends Drawable implements Animatable2 {
		throw new IllegalStateException("called setColorFilter on empty AnimatedImageDrawable");
		}

		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
		public @PixelFormat.Opacity int getOpacity() {