diff options
| author | 2017-04-03 21:21:13 +0000 | |
|---|---|---|
| committer | 2017-04-03 21:21:18 +0000 | |
| commit | c0c524af4f05c072a5812d082ea0d7f38bad03af (patch) | |
| tree | ff0f90daa33e16f3c3ede24bc081633182f1b831 | |
| parent | 5219a85eaae35c89bbf10fd56f30e22e828554bd (diff) | |
| parent | bae8b52c71766ea1a6e59382f8b76e2013f358f9 (diff) | |
Merge "Make Color non-final because apps break..." into oc-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | api/test-current.txt | 2 | ||||
| -rw-r--r-- | graphics/java/android/graphics/Color.java | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index bf35894f2696..3406fd652d0a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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[]); diff --git a/api/system-current.txt b/api/system-current.txt index ec6c6093ec33..cf5a722760c1 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -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[]); diff --git a/api/test-current.txt b/api/test-current.txt index 421cccf4626f..4df250c8ee32 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -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[]); diff --git a/graphics/java/android/graphics/Color.java b/graphics/java/android/graphics/Color.java index d69f67d138a1..218b857ce83c 100644 --- a/graphics/java/android/graphics/Color.java +++ b/graphics/java/android/graphics/Color.java @@ -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; |