Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97497985 authored by Romain Guy's avatar Romain Guy Committed by android-build-merger
Browse files

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

am: c0c524af

Change-Id: Ic2d88c0a09eadd151f164b4da50c6e60df83dbbd
parents 595fdd7d c0c524af

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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[]);

























api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -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[]);

























api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -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[]);

























graphics/java/android/graphics/Color.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -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;