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

Merge "Clean up references to @ColorLong"

Browse Source
This commit is contained in:
Leon Scroggins
2019-03-26 12:45:45 +00:00
committed by Android (Google) Code Review
parent 2384444f75 fda4f61060
commit 75ca391bbe
4 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
graphics/java/android/graphics/Bitmap.java
View File

@@ -1813,21 +1813,22 @@ public final class Bitmap implements Parcelable {
}
/**
* Fills the bitmap's pixels with the specified {@link Color}.
* Fills the bitmap's pixels with the specified {@code ColorLong}.
*
* @param color The color to fill as packed by the {@link Color} class.
* @throws IllegalStateException if the bitmap is not mutable.
* @throws IllegalArgumentException if the color space encoded in the long
* is invalid or unknown.
* @throws IllegalArgumentException if the color space encoded in the
* {@code ColorLong} is invalid or unknown.
*
*/
public void eraseColor(@ColorLong long c) {
public void eraseColor(@ColorLong long color) {
checkRecycled("Can't erase a recycled bitmap");
if (!isMutable()) {
throw new IllegalStateException("cannot erase immutable bitmaps");
}
ColorSpace cs = Color.colorSpace(c);
nativeErase(mNativePtr, cs.getNativeInstance(), c);
ColorSpace cs = Color.colorSpace(color);
nativeErase(mNativePtr, cs.getNativeInstance(), color);
}
/**

14
graphics/java/android/graphics/Canvas.java
View File

@@ -1683,8 +1683,9 @@ public class Canvas extends BaseCanvas {
* Fill the entire canvas' bitmap (restricted to the current clip) with the specified color,
* using srcover porterduff mode.
*
* @param color the color to draw onto the canvas
* @throws IllegalArgumentException if the color space encoded in the long
* @param color the {@code ColorLong} to draw onto the canvas. See the {@link Color}
* class for details about {@code ColorLong}s.
* @throws IllegalArgumentException if the color space encoded in the {@code ColorLong}
* is invalid or unknown.
*/
public void drawColor(@ColorLong long color) {
@@ -1695,7 +1696,7 @@ public class Canvas extends BaseCanvas {
* Fill the entire canvas' bitmap (restricted to the current clip) with the specified color and
* porter-duff xfermode.
*
* @param color the color to draw with
* @param color the color to draw onto the canvas
* @param mode the porter-duff mode to apply to the color
*
* @deprecated use {@link #drawColor(int, BlendMode)} instead
@@ -1709,7 +1710,7 @@ public class Canvas extends BaseCanvas {
* Fill the entire canvas' bitmap (restricted to the current clip) with the specified color and
* blendmode.
*
* @param color the color to draw with
* @param color the color to draw onto the canvas
* @param mode the blendmode to apply to the color
*/
public void drawColor(@ColorInt int color, @NonNull BlendMode mode) {
@@ -1720,9 +1721,10 @@ public class Canvas extends BaseCanvas {
* Fill the entire canvas' bitmap (restricted to the current clip) with the specified color and
* blendmode.
*
* @param color the color to draw with
* @param color the {@code ColorLong} to draw onto the canvas. See the {@link Color}
* class for details about {@code ColorLong}s.
* @param mode the blendmode to apply to the color
* @throws IllegalArgumentException if the color space encoded in the long
* @throws IllegalArgumentException if the color space encoded in the {@code ColorLong}
* is invalid or unknown.
*/
public void drawColor(@ColorLong long color, @NonNull BlendMode mode) {

18
graphics/java/android/graphics/Paint.java
View File

@@ -1029,9 +1029,8 @@ public class Paint {
* premultiplied, meaning that alpha can be any value, regardless of the
* values of r,g,b. See the {@link Color} class for more details.
*
* @see Color for APIs that help manipulate a color long.
*
* @return the paint's color (and alpha).
* @return the paint's color, alpha, and {@code ColorSpace} encoded as a
* {@code ColorLong}
*/
@ColorLong
public long getColorLong() {
@@ -1052,7 +1051,7 @@ public class Paint {
}
/**
* Set the paint's color with a {@link ColorLong}. Note that the color is
* Set the paint's color with a {@code ColorLong}. Note that the color is
* a long with an encoded {@link ColorSpace} as well as alpha and r,g,b.
* These values are not premultiplied, meaning that alpha can be any value,
* regardless of the values of r,g,b. See the {@link Color} class for more
@@ -1060,8 +1059,8 @@ public class Paint {
*
* @param color The new color (including alpha and {@link ColorSpace})
* to set in the paint.
* @throws IllegalArgumentException if the color space encoded in the long
* is invalid or unknown.
* @throws IllegalArgumentException if the color space encoded in the
* {@code ColorLong} is invalid or unknown.
*/
public void setColor(@ColorLong long color) {
ColorSpace cs = Color.colorSpace(color);
@@ -1491,8 +1490,8 @@ public class Paint {
* The alpha of the shadow will be the paint's alpha if the shadow color is
* opaque, or the alpha from the shadow color if not.
*
* @throws IllegalArgumentException if the color space encoded in the long
* is invalid or unknown.
* @throws IllegalArgumentException if the color space encoded in the
* {@code ColorLong} is invalid or unknown.
*/
public void setShadowLayer(float radius, float dx, float dy, @ColorLong long shadowColor) {
ColorSpace cs = Color.colorSpace(shadowColor);
@@ -1559,8 +1558,11 @@ public class Paint {
/**
* Returns the color of the shadow layer.
*
* @return the shadow layer's color encoded as a {@link ColorLong}.
* @see #setShadowLayer(float,float,float,int)
* @see #setShadowLayer(float,float,float,long)
* @see Color
*/
public @ColorLong long getShadowLayerColorLong() {
return mShadowLayerColor;