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

Merge "Added BlendMode equivalent APIs to replace deprecated PorterDuff variants" into qt-dev

Browse Source
This commit is contained in:
Nader Jawad
2019-04-18 21:18:32 +00:00
committed by Android (Google) Code Review
parent b9cd46e163 531db61ac1
commit 5c5ffcbd7a
33 changed files with 594 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
api/current.txt
View File

@@ -13791,7 +13791,7 @@ package android.graphics {
method public void drawCircle(float, float, float, @NonNull android.graphics.Paint);
method public void drawColor(@ColorInt int);
method public void drawColor(@ColorLong long);
method @Deprecated public void drawColor(@ColorInt int, @NonNull android.graphics.PorterDuff.Mode);
method public void drawColor(@ColorInt int, @NonNull android.graphics.PorterDuff.Mode);
method public void drawColor(@ColorInt int, @NonNull android.graphics.BlendMode);
method public void drawColor(@ColorLong long, @NonNull android.graphics.BlendMode);
method public void drawDoubleRoundRect(@NonNull android.graphics.RectF, float, float, @NonNull android.graphics.RectF, float, float, @NonNull android.graphics.Paint);
@@ -14108,7 +14108,7 @@ package android.graphics {
public class ComposeShader extends android.graphics.Shader {
ctor @Deprecated public ComposeShader(@NonNull android.graphics.Shader, @NonNull android.graphics.Shader, @NonNull android.graphics.Xfermode);
ctor @Deprecated public ComposeShader(@NonNull android.graphics.Shader, @NonNull android.graphics.Shader, @NonNull android.graphics.PorterDuff.Mode);
ctor public ComposeShader(@NonNull android.graphics.Shader, @NonNull android.graphics.Shader, @NonNull android.graphics.PorterDuff.Mode);
ctor public ComposeShader(@NonNull android.graphics.Shader, @NonNull android.graphics.Shader, @NonNull android.graphics.BlendMode);
}
@@ -14497,7 +14497,7 @@ package android.graphics {
method @Px public float getUnderlinePosition();
method @Px public float getUnderlineThickness();
method @Px public float getWordSpacing();
method @Deprecated public android.graphics.Xfermode getXfermode();
method public android.graphics.Xfermode getXfermode();
method public boolean hasGlyph(String);
method public final boolean isAntiAlias();
method public final boolean isDither();
@@ -14554,7 +14554,7 @@ package android.graphics {
method public android.graphics.Typeface setTypeface(android.graphics.Typeface);
method public void setUnderlineText(boolean);
method public void setWordSpacing(@Px float);
method @Deprecated public android.graphics.Xfermode setXfermode(android.graphics.Xfermode);
method public android.graphics.Xfermode setXfermode(android.graphics.Xfermode);
field public static final int ANTI_ALIAS_FLAG = 1; // 0x1
field public static final int CURSOR_AFTER = 0; // 0x0
field public static final int CURSOR_AT = 4; // 0x4
@@ -14803,37 +14803,37 @@ package android.graphics {
field public float y;
}
@Deprecated public class PorterDuff {
ctor @Deprecated public PorterDuff();
public class PorterDuff {
ctor public PorterDuff();
}
@Deprecated public enum PorterDuff.Mode {
enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode ADD;
enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode CLEAR;
enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode DARKEN;
enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode DST;
enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode DST_ATOP;
enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode DST_IN;
enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode DST_OUT;
enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode DST_OVER;
enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode LIGHTEN;
enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode MULTIPLY;
enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode OVERLAY;
enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode SCREEN;
enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode SRC;
enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode SRC_ATOP;
enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode SRC_IN;
enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode SRC_OUT;
enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode SRC_OVER;
enum_constant @Deprecated public static final android.graphics.PorterDuff.Mode XOR;
public enum PorterDuff.Mode {
enum_constant public static final android.graphics.PorterDuff.Mode ADD;
enum_constant public static final android.graphics.PorterDuff.Mode CLEAR;
enum_constant public static final android.graphics.PorterDuff.Mode DARKEN;
enum_constant public static final android.graphics.PorterDuff.Mode DST;
enum_constant public static final android.graphics.PorterDuff.Mode DST_ATOP;
enum_constant public static final android.graphics.PorterDuff.Mode DST_IN;
enum_constant public static final android.graphics.PorterDuff.Mode DST_OUT;
enum_constant public static final android.graphics.PorterDuff.Mode DST_OVER;
enum_constant public static final android.graphics.PorterDuff.Mode LIGHTEN;
enum_constant public static final android.graphics.PorterDuff.Mode MULTIPLY;
enum_constant public static final android.graphics.PorterDuff.Mode OVERLAY;
enum_constant public static final android.graphics.PorterDuff.Mode SCREEN;
enum_constant public static final android.graphics.PorterDuff.Mode SRC;
enum_constant public static final android.graphics.PorterDuff.Mode SRC_ATOP;
enum_constant public static final android.graphics.PorterDuff.Mode SRC_IN;
enum_constant public static final android.graphics.PorterDuff.Mode SRC_OUT;
enum_constant public static final android.graphics.PorterDuff.Mode SRC_OVER;
enum_constant public static final android.graphics.PorterDuff.Mode XOR;
}
@Deprecated public class PorterDuffColorFilter extends android.graphics.ColorFilter {
ctor @Deprecated public PorterDuffColorFilter(@ColorInt int, @NonNull android.graphics.PorterDuff.Mode);
public class PorterDuffColorFilter extends android.graphics.ColorFilter {
ctor public PorterDuffColorFilter(@ColorInt int, @NonNull android.graphics.PorterDuff.Mode);
}
@Deprecated public class PorterDuffXfermode extends android.graphics.Xfermode {
ctor @Deprecated public PorterDuffXfermode(android.graphics.PorterDuff.Mode);
public class PorterDuffXfermode extends android.graphics.Xfermode {
ctor public PorterDuffXfermode(android.graphics.PorterDuff.Mode);
}
public interface PostProcessor {
@@ -15394,9 +15394,9 @@ package android.graphics.drawable {
method public final boolean setLevel(@IntRange(from=0, to=10000) int);
method public boolean setState(@NonNull int[]);
method public void setTint(@ColorInt int);
method public void setTintBlendMode(@Nullable android.graphics.BlendMode);
method public void setTintList(@Nullable android.content.res.ColorStateList);
method @Deprecated public void setTintMode(@Nullable android.graphics.PorterDuff.Mode);
method public void setTintMode(@Nullable android.graphics.BlendMode);
method public void setTintMode(@Nullable android.graphics.PorterDuff.Mode);
method public boolean setVisible(boolean, boolean);
method public void unscheduleSelf(@NonNull Runnable);
}
@@ -15553,9 +15553,9 @@ package android.graphics.drawable {
method public void loadDrawableAsync(android.content.Context, android.os.Message);
method public void loadDrawableAsync(android.content.Context, android.graphics.drawable.Icon.OnDrawableLoadedListener, android.os.Handler);
method public android.graphics.drawable.Icon setTint(@ColorInt int);
method @NonNull public android.graphics.drawable.Icon setTintBlendMode(@NonNull android.graphics.BlendMode);
method public android.graphics.drawable.Icon setTintList(android.content.res.ColorStateList);
method @Deprecated @NonNull public android.graphics.drawable.Icon setTintMode(@NonNull android.graphics.PorterDuff.Mode);
method @NonNull public android.graphics.drawable.Icon setTintMode(@NonNull android.graphics.BlendMode);
method @NonNull public android.graphics.drawable.Icon setTintMode(@NonNull android.graphics.PorterDuff.Mode);
method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.graphics.drawable.Icon> CREATOR;
field public static final int TYPE_ADAPTIVE_BITMAP = 5; // 0x5
@@ -49453,7 +49453,7 @@ package android.view {
method public android.graphics.drawable.Drawable getIcon();
method @Nullable public default android.graphics.BlendMode getIconTintBlendMode();
method @Nullable public default android.content.res.ColorStateList getIconTintList();
method @Deprecated @Nullable public default android.graphics.PorterDuff.Mode getIconTintMode();
method @Nullable public default android.graphics.PorterDuff.Mode getIconTintMode();
method public android.content.Intent getIntent();
method public int getItemId();
method public android.view.ContextMenu.ContextMenuInfo getMenuInfo();
@@ -49481,9 +49481,9 @@ package android.view {
method public android.view.MenuItem setEnabled(boolean);
method public android.view.MenuItem setIcon(android.graphics.drawable.Drawable);
method public android.view.MenuItem setIcon(@DrawableRes int);
method @NonNull public default android.view.MenuItem setIconTintBlendMode(@Nullable android.graphics.BlendMode);
method public default android.view.MenuItem setIconTintList(@Nullable android.content.res.ColorStateList);
method @Deprecated @NonNull public default android.view.MenuItem setIconTintMode(@Nullable android.graphics.PorterDuff.Mode);
method @NonNull public default android.view.MenuItem setIconTintMode(@Nullable android.graphics.BlendMode);
method @NonNull public default android.view.MenuItem setIconTintMode(@Nullable android.graphics.PorterDuff.Mode);
method public android.view.MenuItem setIntent(android.content.Intent);
method public android.view.MenuItem setNumericShortcut(char);
method public default android.view.MenuItem setNumericShortcut(char, int);
@@ -50136,9 +50136,9 @@ package android.view {
method public int getAutofillType();
method @Nullable public android.view.autofill.AutofillValue getAutofillValue();
method public android.graphics.drawable.Drawable getBackground();
method @Nullable public android.graphics.BlendMode getBackgroundBlendMode();
method @Nullable public android.graphics.BlendMode getBackgroundTintBlendMode();
method @Nullable public android.content.res.ColorStateList getBackgroundTintList();
method @Deprecated @Nullable public android.graphics.PorterDuff.Mode getBackgroundTintMode();
method @Nullable public android.graphics.PorterDuff.Mode getBackgroundTintMode();
method @android.view.ViewDebug.ExportedProperty(category="layout") public int getBaseline();
method @android.view.ViewDebug.CapturedViewProperty public final int getBottom();
method protected float getBottomFadingEdgeStrength();
@@ -50169,10 +50169,10 @@ package android.view {
method public java.util.ArrayList<android.view.View> getFocusables(int);
method public void getFocusedRect(android.graphics.Rect);
method public android.graphics.drawable.Drawable getForeground();
method @Nullable public android.graphics.BlendMode getForegroundBlendMode();
method public int getForegroundGravity();
method @Nullable public android.graphics.BlendMode getForegroundTintBlendMode();
method @Nullable public android.content.res.ColorStateList getForegroundTintList();
method @Deprecated @Nullable public android.graphics.PorterDuff.Mode getForegroundTintMode();
method @Nullable public android.graphics.PorterDuff.Mode getForegroundTintMode();
method public boolean getGlobalVisibleRect(android.graphics.Rect, android.graphics.Point);
method public final boolean getGlobalVisibleRect(android.graphics.Rect);
method public android.os.Handler getHandler();
@@ -50484,9 +50484,9 @@ package android.view {
method public void setBackgroundColor(@ColorInt int);
method @Deprecated public void setBackgroundDrawable(android.graphics.drawable.Drawable);
method public void setBackgroundResource(@DrawableRes int);
method public void setBackgroundTintBlendMode(@Nullable android.graphics.BlendMode);
method public void setBackgroundTintList(@Nullable android.content.res.ColorStateList);
method @Deprecated public void setBackgroundTintMode(@Nullable android.graphics.PorterDuff.Mode);
method public void setBackgroundTintMode(@Nullable android.graphics.BlendMode);
method public void setBackgroundTintMode(@Nullable android.graphics.PorterDuff.Mode);
method public final void setBottom(int);
method public void setCameraDistance(float);
method public void setClickable(boolean);
@@ -50512,9 +50512,9 @@ package android.view {
method public void setForceDarkAllowed(boolean);
method public void setForeground(android.graphics.drawable.Drawable);
method public void setForegroundGravity(int);
method public void setForegroundTintBlendMode(@Nullable android.graphics.BlendMode);
method public void setForegroundTintList(@Nullable android.content.res.ColorStateList);
method @Deprecated public void setForegroundTintMode(@Nullable android.graphics.PorterDuff.Mode);
method public void setForegroundTintMode(@Nullable android.graphics.BlendMode);
method public void setForegroundTintMode(@Nullable android.graphics.PorterDuff.Mode);
method public void setHapticFeedbackEnabled(boolean);
method public void setHasTransientState(boolean);
method public void setHorizontalFadingEdgeEnabled(boolean);
@@ -54850,18 +54850,22 @@ package android.widget {
method public boolean getSplitTrack();
method public android.graphics.drawable.Drawable getThumb();
method public int getThumbOffset();
method @Nullable public android.graphics.BlendMode getThumbTintBlendMode();
method @Nullable public android.content.res.ColorStateList getThumbTintList();
method @Nullable public android.graphics.PorterDuff.Mode getThumbTintMode();
method public android.graphics.drawable.Drawable getTickMark();
method @Nullable public android.graphics.BlendMode getTickMarkTintBlendMode();
method @Nullable public android.content.res.ColorStateList getTickMarkTintList();
method @Nullable public android.graphics.PorterDuff.Mode getTickMarkTintMode();
method public void setKeyProgressIncrement(int);
method public void setSplitTrack(boolean);
method public void setThumb(android.graphics.drawable.Drawable);
method public void setThumbOffset(int);
method public void setThumbTintBlendMode(@Nullable android.graphics.BlendMode);
method public void setThumbTintList(@Nullable android.content.res.ColorStateList);
method public void setThumbTintMode(@Nullable android.graphics.PorterDuff.Mode);
method public void setTickMark(android.graphics.drawable.Drawable);
method public void setTickMarkTintBlendMode(@Nullable android.graphics.BlendMode);
method public void setTickMarkTintList(@Nullable android.content.res.ColorStateList);
method public void setTickMarkTintMode(@Nullable android.graphics.PorterDuff.Mode);
}
@@ -55260,11 +55264,13 @@ package android.widget {
ctor public CheckedTextView(android.content.Context, android.util.AttributeSet, int);
ctor public CheckedTextView(android.content.Context, android.util.AttributeSet, int, int);
method public android.graphics.drawable.Drawable getCheckMarkDrawable();
method @Nullable public android.graphics.BlendMode getCheckMarkTintBlendMode();
method @Nullable public android.content.res.ColorStateList getCheckMarkTintList();
method @Nullable public android.graphics.PorterDuff.Mode getCheckMarkTintMode();
method @android.view.ViewDebug.ExportedProperty public boolean isChecked();
method public void setCheckMarkDrawable(@DrawableRes int);
method public void setCheckMarkDrawable(@Nullable android.graphics.drawable.Drawable);
method public void setCheckMarkTintBlendMode(@Nullable android.graphics.BlendMode);
method public void setCheckMarkTintList(@Nullable android.content.res.ColorStateList);
method public void setCheckMarkTintMode(@Nullable android.graphics.PorterDuff.Mode);
method public void setChecked(boolean);
@@ -55299,11 +55305,13 @@ package android.widget {
ctor public CompoundButton(android.content.Context, android.util.AttributeSet, int);
ctor public CompoundButton(android.content.Context, android.util.AttributeSet, int, int);
method @Nullable public android.graphics.drawable.Drawable getButtonDrawable();
method @Nullable public android.graphics.BlendMode getButtonTintBlendMode();
method @Nullable public android.content.res.ColorStateList getButtonTintList();
method @Nullable public android.graphics.PorterDuff.Mode getButtonTintMode();
method @android.view.ViewDebug.ExportedProperty public boolean isChecked();
method public void setButtonDrawable(@DrawableRes int);
method public void setButtonDrawable(@Nullable android.graphics.drawable.Drawable);
method public void setButtonTintBlendMode(@Nullable android.graphics.BlendMode);
method public void setButtonTintList(@Nullable android.content.res.ColorStateList);
method public void setButtonTintMode(@Nullable android.graphics.PorterDuff.Mode);
method public void setChecked(boolean);
@@ -55792,6 +55800,7 @@ package android.widget {
method public android.graphics.drawable.Drawable getDrawable();
method public int getImageAlpha();
method public android.graphics.Matrix getImageMatrix();
method @Nullable public android.graphics.BlendMode getImageTintBlendMode();
method @Nullable public android.content.res.ColorStateList getImageTintList();
method @Nullable public android.graphics.PorterDuff.Mode getImageTintMode();
method public int getMaxHeight();
@@ -55815,6 +55824,7 @@ package android.widget {
method public void setImageMatrix(android.graphics.Matrix);
method public void setImageResource(@DrawableRes int);
method public void setImageState(int[], boolean);
method public void setImageTintBlendMode(@Nullable android.graphics.BlendMode);
method public void setImageTintList(@Nullable android.content.res.ColorStateList);
method public void setImageTintMode(@Nullable android.graphics.PorterDuff.Mode);
method public void setImageURI(@Nullable android.net.Uri);
@@ -56268,6 +56278,7 @@ package android.widget {
ctor public ProgressBar(android.content.Context, android.util.AttributeSet, int, int);
method @Nullable public android.graphics.drawable.Drawable getCurrentDrawable();
method public android.graphics.drawable.Drawable getIndeterminateDrawable();
method @Nullable public android.graphics.BlendMode getIndeterminateTintBlendMode();
method @Nullable public android.content.res.ColorStateList getIndeterminateTintList();
method @Nullable public android.graphics.PorterDuff.Mode getIndeterminateTintMode();
method public android.view.animation.Interpolator getInterpolator();
@@ -56278,12 +56289,15 @@ package android.widget {
method @Px public int getMinHeight();
method @Px public int getMinWidth();
method @android.view.ViewDebug.ExportedProperty(category="progress") public int getProgress();
method @Nullable public android.graphics.BlendMode getProgressBackgroundTintBlendMode();
method @Nullable public android.content.res.ColorStateList getProgressBackgroundTintList();
method @Nullable public android.graphics.PorterDuff.Mode getProgressBackgroundTintMode();
method public android.graphics.drawable.Drawable getProgressDrawable();
method @Nullable public android.graphics.BlendMode getProgressTintBlendMode();
method @Nullable public android.content.res.ColorStateList getProgressTintList();
method @Nullable public android.graphics.PorterDuff.Mode getProgressTintMode();
method @android.view.ViewDebug.ExportedProperty(category="progress") public int getSecondaryProgress();
method @Nullable public android.graphics.BlendMode getSecondaryProgressTintBlendMode();
method @Nullable public android.content.res.ColorStateList getSecondaryProgressTintList();
method @Nullable public android.graphics.PorterDuff.Mode getSecondaryProgressTintMode();
method public final void incrementProgressBy(int);
@@ -56295,6 +56309,7 @@ package android.widget {
method public void setIndeterminate(boolean);
method public void setIndeterminateDrawable(android.graphics.drawable.Drawable);
method public void setIndeterminateDrawableTiled(android.graphics.drawable.Drawable);
method public void setIndeterminateTintBlendMode(@Nullable android.graphics.BlendMode);
method public void setIndeterminateTintList(@Nullable android.content.res.ColorStateList);
method public void setIndeterminateTintMode(@Nullable android.graphics.PorterDuff.Mode);
method public void setInterpolator(android.content.Context, @InterpolatorRes int);
@@ -56307,13 +56322,16 @@ package android.widget {
method public void setMinWidth(@Px int);
method public void setProgress(int);
method public void setProgress(int, boolean);
method public void setProgressBackgroundTintBlendMode(@Nullable android.graphics.BlendMode);
method public void setProgressBackgroundTintList(@Nullable android.content.res.ColorStateList);
method public void setProgressBackgroundTintMode(@Nullable android.graphics.PorterDuff.Mode);
method public void setProgressDrawable(android.graphics.drawable.Drawable);
method public void setProgressDrawableTiled(android.graphics.drawable.Drawable);
method public void setProgressTintBlendMode(@Nullable android.graphics.BlendMode);
method public void setProgressTintList(@Nullable android.content.res.ColorStateList);
method public void setProgressTintMode(@Nullable android.graphics.PorterDuff.Mode);
method public void setSecondaryProgress(int);
method public void setSecondaryProgressTintBlendMode(@Nullable android.graphics.BlendMode);
method public void setSecondaryProgressTintList(@Nullable android.content.res.ColorStateList);
method public void setSecondaryProgressTintMode(@Nullable android.graphics.PorterDuff.Mode);
}
@@ -56862,9 +56880,11 @@ package android.widget {
method public CharSequence getTextOn();
method public android.graphics.drawable.Drawable getThumbDrawable();
method public int getThumbTextPadding();
method @Nullable public android.graphics.BlendMode getThumbTintBlendMode();
method @Nullable public android.content.res.ColorStateList getThumbTintList();
method @Nullable public android.graphics.PorterDuff.Mode getThumbTintMode();
method public android.graphics.drawable.Drawable getTrackDrawable();
method @Nullable public android.graphics.BlendMode getTrackTintBlendMode();
method @Nullable public android.content.res.ColorStateList getTrackTintList();
method @Nullable public android.graphics.PorterDuff.Mode getTrackTintMode();
method public void onMeasure(int, int);
@@ -56880,10 +56900,12 @@ package android.widget {
method public void setThumbDrawable(android.graphics.drawable.Drawable);
method public void setThumbResource(@DrawableRes int);
method public void setThumbTextPadding(int);
method public void setThumbTintBlendMode(@Nullable android.graphics.BlendMode);
method public void setThumbTintList(@Nullable android.content.res.ColorStateList);
method public void setThumbTintMode(@Nullable android.graphics.PorterDuff.Mode);
method public void setTrackDrawable(android.graphics.drawable.Drawable);
method public void setTrackResource(@DrawableRes int);
method public void setTrackTintBlendMode(@Nullable android.graphics.BlendMode);
method public void setTrackTintList(@Nullable android.content.res.ColorStateList);
method public void setTrackTintMode(@Nullable android.graphics.PorterDuff.Mode);
}
@@ -57041,6 +57063,7 @@ package android.widget {
method public int getAutoSizeTextType();
method public int getBreakStrategy();
method public int getCompoundDrawablePadding();
method @Nullable public android.graphics.BlendMode getCompoundDrawableTintBlendMode();
method public android.content.res.ColorStateList getCompoundDrawableTintList();
method public android.graphics.PorterDuff.Mode getCompoundDrawableTintMode();
method @NonNull public android.graphics.drawable.Drawable[] getCompoundDrawables();
@@ -57166,6 +57189,7 @@ package android.widget {
method public void setAutoSizeTextTypeWithDefaults(int);
method public void setBreakStrategy(int);
method public void setCompoundDrawablePadding(int);
method public void setCompoundDrawableTintBlendMode(@Nullable android.graphics.BlendMode);
method public void setCompoundDrawableTintList(@Nullable android.content.res.ColorStateList);
method public void setCompoundDrawableTintMode(@Nullable android.graphics.PorterDuff.Mode);
method public void setCompoundDrawables(@Nullable android.graphics.drawable.Drawable, @Nullable android.graphics.drawable.Drawable, @Nullable android.graphics.drawable.Drawable, @Nullable android.graphics.drawable.Drawable);