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

Merge "Make Color non-final because apps break..." into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-03 21:21:13 +00:00
committed by Android (Google) Code Review
parent 5219a85eaa bae8b52c71
commit c0c524af4f
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -12699,7 +12699,7 @@ package android.graphics {
enum_constant public static final android.graphics.Canvas.VertexMode TRIANGLE_STRIP;
}
public final class Color {
public class Color {
ctor public Color();
method public static int HSVToColor(float[]);
method public static int HSVToColor(int, float[]);

2
api/system-current.txt
View File

@@ -13431,7 +13431,7 @@ package android.graphics {
enum_constant public static final android.graphics.Canvas.VertexMode TRIANGLE_STRIP;
}
public final class Color {
public class Color {
ctor public Color();
method public static int HSVToColor(float[]);
method public static int HSVToColor(int, float[]);

2
api/test-current.txt
View File

@@ -12749,7 +12749,7 @@ package android.graphics {
enum_constant public static final android.graphics.Canvas.VertexMode TRIANGLE_STRIP;
}
public final class Color {
public class Color {
ctor public Color();
method public static int HSVToColor(float[]);
method public static int HSVToColor(int, float[]);

2
graphics/java/android/graphics/Color.java
View File

@@ -289,7 +289,7 @@ import java.util.function.DoubleUnaryOperator;
* and <code>(1.0, 0.0, 0.0, 0.5)</code>.</p>
*/
@AnyThread
public final class Color {
public class Color {
@ColorInt public static final int BLACK = 0xFF000000;
@ColorInt public static final int DKGRAY = 0xFF444444;
@ColorInt public static final int GRAY = 0xFF888888;