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

Commit 03ab3520 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Color API to create/store wide-gamut colors in a long"

parents a9fe012e 77b161e0

api/current.txt

+43 −1
Original line number Diff line number Diff line
@@ -12121,15 +12121,57 @@ package android.graphics { 
    method public static int HSVToColor(float[]);

    method public static int HSVToColor(int, float[]);

    method public static void RGBToHSV(int, int, int, float[]);

    method public float alpha();

    method public static float alpha(long);

    method public static int alpha(int);

    method public static int argb(int, int, int, int);

    method public static int argb(float, float, float, float);

    method public float blue();

    method public static float blue(long);

    method public static int blue(int);

    method public static android.graphics.ColorSpace colorSpace(long);

    method public static void colorToHSV(int, float[]);

    method public android.graphics.Color convert(android.graphics.ColorSpace);

    method public static long convert(int, android.graphics.ColorSpace);

    method public static long convert(long, android.graphics.ColorSpace);

    method public static long convert(float, float, float, float, android.graphics.ColorSpace, android.graphics.ColorSpace);

    method public static long convert(long, android.graphics.ColorSpace.Connector);

    method public static long convert(float, float, float, float, android.graphics.ColorSpace.Connector);

    method public android.graphics.ColorSpace getColorSpace();

    method public float getComponent(int);

    method public int getComponentCount();

    method public float[] getComponents();

    method public android.graphics.ColorSpace.Model getModel();

    method public float green();

    method public static float green(long);

    method public static int green(int);

    method public static boolean isInColorSpace(long, android.graphics.ColorSpace);

    method public boolean isSrgb();

    method public static boolean isSrgb(long);

    method public boolean isWideGamut();

    method public static boolean isWideGamut(long);

    method public float luminance();

    method public static float luminance(long);

    method public static float luminance(int);

    method public long pack();

    method public static long pack(int);

    method public static long pack(float, float, float);

    method public static long pack(float, float, float, float);

    method public static long pack(float, float, float, float, android.graphics.ColorSpace);

    method public static int parseColor(java.lang.String);

    method public float red();

    method public static float red(long);

    method public static int red(int);

    method public static int rgb(int, int, int);

    method public static int rgb(float, float, float);

    method public int toArgb();

    method public static int toArgb(long);

    method public static android.graphics.Color valueOf(int);

    method public static android.graphics.Color valueOf(long);

    method public static android.graphics.Color valueOf(float, float, float);

    method public static android.graphics.Color valueOf(float, float, float, float);

    method public static android.graphics.Color valueOf(float, float, float, float, android.graphics.ColorSpace);

    method public static android.graphics.Color valueOf(float[], android.graphics.ColorSpace);

    field public static final int BLACK = -16777216; // 0xff000000

    field public static final int BLUE = -16776961; // 0xff0000ff

    field public static final int CYAN = -16711681; // 0xff00ffff
@@ -12201,7 +12243,7 @@ package android.graphics { 
    field public static final float[] ILLUMINANT_D65;

    field public static final float[] ILLUMINANT_D75;

    field public static final float[] ILLUMINANT_E;

    field public static final int MAX_ID = 64; // 0x40

    field public static final int MAX_ID = 63; // 0x3f

    field public static final int MIN_ID = -1; // 0xffffffff

  }

























api/system-current.txt



+43
−1






























Original line number
Diff line number
Diff line







@@ -12636,15 +12636,57 @@ package android.graphics {







    method public static int HSVToColor(float[]);









    method public static int HSVToColor(int, float[]);









    method public static void RGBToHSV(int, int, int, float[]);









    method public float alpha();









    method public static float alpha(long);









    method public static int alpha(int);









    method public static int argb(int, int, int, int);









    method public static int argb(float, float, float, float);









    method public float blue();









    method public static float blue(long);









    method public static int blue(int);









    method public static android.graphics.ColorSpace colorSpace(long);









    method public static void colorToHSV(int, float[]);









    method public android.graphics.Color convert(android.graphics.ColorSpace);









    method public static long convert(int, android.graphics.ColorSpace);









    method public static long convert(long, android.graphics.ColorSpace);









    method public static long convert(float, float, float, float, android.graphics.ColorSpace, android.graphics.ColorSpace);









    method public static long convert(long, android.graphics.ColorSpace.Connector);









    method public static long convert(float, float, float, float, android.graphics.ColorSpace.Connector);









    method public android.graphics.ColorSpace getColorSpace();









    method public float getComponent(int);









    method public int getComponentCount();









    method public float[] getComponents();









    method public android.graphics.ColorSpace.Model getModel();









    method public float green();









    method public static float green(long);









    method public static int green(int);









    method public static boolean isInColorSpace(long, android.graphics.ColorSpace);









    method public boolean isSrgb();









    method public static boolean isSrgb(long);









    method public boolean isWideGamut();









    method public static boolean isWideGamut(long);









    method public float luminance();









    method public static float luminance(long);









    method public static float luminance(int);









    method public long pack();









    method public static long pack(int);









    method public static long pack(float, float, float);









    method public static long pack(float, float, float, float);









    method public static long pack(float, float, float, float, android.graphics.ColorSpace);









    method public static int parseColor(java.lang.String);









    method public float red();









    method public static float red(long);









    method public static int red(int);









    method public static int rgb(int, int, int);









    method public static int rgb(float, float, float);









    method public int toArgb();









    method public static int toArgb(long);









    method public static android.graphics.Color valueOf(int);









    method public static android.graphics.Color valueOf(long);









    method public static android.graphics.Color valueOf(float, float, float);









    method public static android.graphics.Color valueOf(float, float, float, float);









    method public static android.graphics.Color valueOf(float, float, float, float, android.graphics.ColorSpace);









    method public static android.graphics.Color valueOf(float[], android.graphics.ColorSpace);









    field public static final int BLACK = -16777216; // 0xff000000









    field public static final int BLUE = -16776961; // 0xff0000ff









    field public static final int CYAN = -16711681; // 0xff00ffff








@@ -12716,7 +12758,7 @@ package android.graphics {







    field public static final float[] ILLUMINANT_D65;









    field public static final float[] ILLUMINANT_D75;









    field public static final float[] ILLUMINANT_E;









    field public static final int MAX_ID = 64; // 0x40









    field public static final int MAX_ID = 63; // 0x3f









    field public static final int MIN_ID = -1; // 0xffffffff









  }

































api/test-current.txt



+43
−1






























Original line number
Diff line number
Diff line







@@ -12153,15 +12153,57 @@ package android.graphics {







    method public static int HSVToColor(float[]);









    method public static int HSVToColor(int, float[]);









    method public static void RGBToHSV(int, int, int, float[]);









    method public float alpha();









    method public static float alpha(long);









    method public static int alpha(int);









    method public static int argb(int, int, int, int);









    method public static int argb(float, float, float, float);









    method public float blue();









    method public static float blue(long);









    method public static int blue(int);









    method public static android.graphics.ColorSpace colorSpace(long);









    method public static void colorToHSV(int, float[]);









    method public android.graphics.Color convert(android.graphics.ColorSpace);









    method public static long convert(int, android.graphics.ColorSpace);









    method public static long convert(long, android.graphics.ColorSpace);









    method public static long convert(float, float, float, float, android.graphics.ColorSpace, android.graphics.ColorSpace);









    method public static long convert(long, android.graphics.ColorSpace.Connector);









    method public static long convert(float, float, float, float, android.graphics.ColorSpace.Connector);









    method public android.graphics.ColorSpace getColorSpace();









    method public float getComponent(int);









    method public int getComponentCount();









    method public float[] getComponents();









    method public android.graphics.ColorSpace.Model getModel();









    method public float green();









    method public static float green(long);









    method public static int green(int);









    method public static boolean isInColorSpace(long, android.graphics.ColorSpace);









    method public boolean isSrgb();









    method public static boolean isSrgb(long);









    method public boolean isWideGamut();









    method public static boolean isWideGamut(long);









    method public float luminance();









    method public static float luminance(long);









    method public static float luminance(int);









    method public long pack();









    method public static long pack(int);









    method public static long pack(float, float, float);









    method public static long pack(float, float, float, float);









    method public static long pack(float, float, float, float, android.graphics.ColorSpace);









    method public static int parseColor(java.lang.String);









    method public float red();









    method public static float red(long);









    method public static int red(int);









    method public static int rgb(int, int, int);









    method public static int rgb(float, float, float);









    method public int toArgb();









    method public static int toArgb(long);









    method public static android.graphics.Color valueOf(int);









    method public static android.graphics.Color valueOf(long);









    method public static android.graphics.Color valueOf(float, float, float);









    method public static android.graphics.Color valueOf(float, float, float, float);









    method public static android.graphics.Color valueOf(float, float, float, float, android.graphics.ColorSpace);









    method public static android.graphics.Color valueOf(float[], android.graphics.ColorSpace);









    field public static final int BLACK = -16777216; // 0xff000000









    field public static final int BLUE = -16776961; // 0xff0000ff









    field public static final int CYAN = -16711681; // 0xff00ffff








@@ -12233,7 +12275,7 @@ package android.graphics {







    field public static final float[] ILLUMINANT_D65;









    field public static final float[] ILLUMINANT_D75;









    field public static final float[] ILLUMINANT_E;









    field public static final int MAX_ID = 64; // 0x40









    field public static final int MAX_ID = 63; // 0x3f









    field public static final int MIN_ID = -1; // 0xffffffff









  }