Merge "Fix ColorStateListDrawable container callback API" (1c30b0f8) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/drawable/ColorStateListDrawable.java

+6 −12

Original line number	Diff line number	Diff line
		@@ -157,28 +157,22 @@ public class ColorStateListDrawable extends Drawable implements Drawable.Callbac

		@Override
		public void invalidateDrawable(Drawable who) {
		final Callback callback = getCallback();

		if (callback != null) {
		callback.invalidateDrawable(who);
		if (who == mColorDrawable && getCallback() != null) {
		getCallback().invalidateDrawable(this);
		}
		}

		@Override
		public void scheduleDrawable(Drawable who, Runnable what, long when) {
		final Callback callback = getCallback();

		if (callback != null) {
		callback.scheduleDrawable(who, what, when);
		if (who == mColorDrawable && getCallback() != null) {
		getCallback().scheduleDrawable(this, what, when);
		}
		}

		@Override
		public void unscheduleDrawable(Drawable who, Runnable what) {
		final Callback callback = getCallback();

		if (callback != null) {
		callback.unscheduleDrawable(who, what);
		if (who == mColorDrawable && getCallback() != null) {
		getCallback().unscheduleDrawable(this, what);
		}
		}