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

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

Merge "Hide new ColorSpace APIs"

parents ab8fa447 7d7a4987

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -13947,8 +13947,6 @@ package android.graphics { 
  @AnyThread public abstract class ColorSpace {

    method @NonNull public static android.graphics.ColorSpace adapt(@NonNull android.graphics.ColorSpace, @NonNull @Size(min=2, max=3) float[]);

    method @NonNull public static android.graphics.ColorSpace adapt(@NonNull android.graphics.ColorSpace, @NonNull @Size(min=2, max=3) float[], @NonNull android.graphics.ColorSpace.Adaptation);

    method @NonNull @Size(3) public static float[] cctToIlluminantdXyz(@IntRange(from=1) int);

    method @NonNull @Size(9) public static float[] chromaticAdaptation(@NonNull android.graphics.ColorSpace.Adaptation, @NonNull @Size(min=2, max=3) float[], @NonNull @Size(min=2, max=3) float[]);

    method @NonNull public static android.graphics.ColorSpace.Connector connect(@NonNull android.graphics.ColorSpace, @NonNull android.graphics.ColorSpace);

    method @NonNull public static android.graphics.ColorSpace.Connector connect(@NonNull android.graphics.ColorSpace, @NonNull android.graphics.ColorSpace, @NonNull android.graphics.ColorSpace.RenderIntent);

    method @NonNull public static android.graphics.ColorSpace.Connector connect(@NonNull android.graphics.ColorSpace);

graphics/java/android/graphics/ColorSpace.java

+4 −0
Original line number Diff line number Diff line
@@ -1821,6 +1821,8 @@ public abstract class ColorSpace { 
     * @param cct The correlated color temperature, in Kelvin

     * @return Corresponding XYZ values

     * @throws IllegalArgumentException If cct is invalid

     *

     * @hide

     */

    @NonNull

    @Size(3)
@@ -1851,6 +1853,8 @@ public abstract class ColorSpace { 
     * @param srcWhitePoint The white point to adapt from

     * @param dstWhitePoint The white point to adapt to

     * @return A 3x3 matrix as a non-null array of 9 floats

     *

     * @hide

     */

    @NonNull

    @Size(9)