Merge cherrypicks of [6900390, 6901499, 6901622] into qt-release (0343b0af) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -15389,8 +15389,8 @@ package android.graphics.drawable {
		method public boolean setState(@NonNull int[]);
		method public void setTint(@ColorInt int);
		method public void setTintList(@Nullable android.content.res.ColorStateList);
		method @Deprecated public void setTintMode(@NonNull android.graphics.PorterDuff.Mode);
		method public void setTintMode(@NonNull android.graphics.BlendMode);
		method @Deprecated public void setTintMode(@Nullable android.graphics.PorterDuff.Mode);
		method public void setTintMode(@Nullable android.graphics.BlendMode);
		method public boolean setVisible(boolean, boolean);
		method public void unscheduleSelf(@NonNull Runnable);
		}

graphics/java/android/graphics/drawable/Drawable.java

+10 −11

Original line number	Diff line number	Diff line
		@@ -688,20 +688,20 @@ public abstract class Drawable {
		* {@link #setColorFilter(int, PorterDuff.Mode)} overrides tint.
		* </p>
		*
		* @param tintMode A Porter-Duff blending mode
		* @param tintMode A Porter-Duff blending mode to apply to the drawable, a value of null sets
		* the default Porter-Diff blending mode value
		* of {@link PorterDuff.Mode#SRC_IN}
		* @see #setTint(int)
		* @see #setTintList(ColorStateList)
		*
		* @deprecated use {@link #setTintMode(BlendMode)} instead
		*/
		@Deprecated
		public void setTintMode(@NonNull PorterDuff.Mode tintMode) {
		public void setTintMode(@Nullable PorterDuff.Mode tintMode) {
		if (!mSetTintModeInvoked) {
		mSetTintModeInvoked = true;
		BlendMode mode = BlendMode.fromValue(tintMode.nativeInt);
		if (mode != null) {
		setTintMode(mode);
		}
		BlendMode mode = tintMode != null ? BlendMode.fromValue(tintMode.nativeInt) : null;
		setTintMode(mode != null ? mode : Drawable.DEFAULT_BLEND_MODE);
		mSetTintModeInvoked = false;
		}
		}
		@@ -716,17 +716,16 @@ public abstract class Drawable {
		* {@link #setColorFilter(ColorFilter)}
		* </p>
		*
		* @param blendMode
		* @param blendMode BlendMode to apply to the drawable, a value of null sets the default
		* blend mode value of {@link BlendMode#SRC_IN}
		* @see #setTint(int)
		* @see #setTintList(ColorStateList)
		*/
		public void setTintMode(@NonNull BlendMode blendMode) {
		public void setTintMode(@Nullable BlendMode blendMode) {
		if (!mSetBlendModeInvoked) {
		mSetBlendModeInvoked = true;
		PorterDuff.Mode mode = BlendMode.blendModeToPorterDuffMode(blendMode);
		if (mode != null) {
		setTintMode(mode);
		}
		setTintMode(mode != null ? mode : Drawable.DEFAULT_TINT_MODE);
		mSetBlendModeInvoked = false;
		}
		}