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

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

Merge "Hide ColorSpace.Renderer" into oc-dev am: 5094caaf 

am: 3509d1f7

Change-Id: Ic7bb2ee6326a9152bbd3bb015025d8f39d7a2527
parents 017f4870 3509d1f7

api/current.txt

+0 −11
Original line number Diff line number Diff line
@@ -12823,7 +12823,6 @@ package android.graphics { 
    method public static android.graphics.ColorSpace.Connector connect(android.graphics.ColorSpace, android.graphics.ColorSpace, android.graphics.ColorSpace.RenderIntent);

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

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

    method public static android.graphics.ColorSpace.Renderer createRenderer();

    method public float[] fromXyz(float, float, float);

    method public abstract float[] fromXyz(float[]);

    method public static android.graphics.ColorSpace get(android.graphics.ColorSpace.Named);
@@ -12907,16 +12906,6 @@ package android.graphics { 
    enum_constant public static final android.graphics.ColorSpace.RenderIntent SATURATION;

  }













  public static class ColorSpace.Renderer {













    method public android.graphics.ColorSpace.Renderer add(android.graphics.ColorSpace, int);













    method public android.graphics.ColorSpace.Renderer add(android.graphics.ColorSpace, float, float, float, int);













    method public android.graphics.ColorSpace.Renderer clip(boolean);













    method public android.graphics.Bitmap render();













    method public android.graphics.ColorSpace.Renderer showWhitePoint(boolean);













    method public android.graphics.ColorSpace.Renderer size(int);













    method public android.graphics.ColorSpace.Renderer uniformChromaticityScale(boolean);













  }



























  public static class ColorSpace.Rgb extends android.graphics.ColorSpace {















    ctor public ColorSpace.Rgb(java.lang.String, float[], java.util.function.DoubleUnaryOperator, java.util.function.DoubleUnaryOperator);















    ctor public ColorSpace.Rgb(java.lang.String, float[], float[], java.util.function.DoubleUnaryOperator, java.util.function.DoubleUnaryOperator, float, float);

























api/system-current.txt



+0
−11




























Original line number
Diff line number
Diff line








@@ -13588,7 +13588,6 @@ package android.graphics {













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















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















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













    method public static android.graphics.ColorSpace.Renderer createRenderer();















    method public float[] fromXyz(float, float, float);















    method public abstract float[] fromXyz(float[]);















    method public static android.graphics.ColorSpace get(android.graphics.ColorSpace.Named);










@@ -13672,16 +13671,6 @@ package android.graphics {













    enum_constant public static final android.graphics.ColorSpace.RenderIntent SATURATION;















  }



























  public static class ColorSpace.Renderer {













    method public android.graphics.ColorSpace.Renderer add(android.graphics.ColorSpace, int);













    method public android.graphics.ColorSpace.Renderer add(android.graphics.ColorSpace, float, float, float, int);













    method public android.graphics.ColorSpace.Renderer clip(boolean);













    method public android.graphics.Bitmap render();













    method public android.graphics.ColorSpace.Renderer showWhitePoint(boolean);













    method public android.graphics.ColorSpace.Renderer size(int);













    method public android.graphics.ColorSpace.Renderer uniformChromaticityScale(boolean);













  }



























  public static class ColorSpace.Rgb extends android.graphics.ColorSpace {















    ctor public ColorSpace.Rgb(java.lang.String, float[], java.util.function.DoubleUnaryOperator, java.util.function.DoubleUnaryOperator);















    ctor public ColorSpace.Rgb(java.lang.String, float[], float[], java.util.function.DoubleUnaryOperator, java.util.function.DoubleUnaryOperator, float, float);

























api/test-current.txt



+0
−11




























Original line number
Diff line number
Diff line








@@ -12873,7 +12873,6 @@ package android.graphics {













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















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















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













    method public static android.graphics.ColorSpace.Renderer createRenderer();















    method public float[] fromXyz(float, float, float);















    method public abstract float[] fromXyz(float[]);















    method public static android.graphics.ColorSpace get(android.graphics.ColorSpace.Named);










@@ -12957,16 +12956,6 @@ package android.graphics {













    enum_constant public static final android.graphics.ColorSpace.RenderIntent SATURATION;















  }



























  public static class ColorSpace.Renderer {













    method public android.graphics.ColorSpace.Renderer add(android.graphics.ColorSpace, int);













    method public android.graphics.ColorSpace.Renderer add(android.graphics.ColorSpace, float, float, float, int);













    method public android.graphics.ColorSpace.Renderer clip(boolean);













    method public android.graphics.Bitmap render();













    method public android.graphics.ColorSpace.Renderer showWhitePoint(boolean);













    method public android.graphics.ColorSpace.Renderer size(int);













    method public android.graphics.ColorSpace.Renderer uniformChromaticityScale(boolean);













  }



























  public static class ColorSpace.Rgb extends android.graphics.ColorSpace {















    ctor public ColorSpace.Rgb(java.lang.String, float[], java.util.function.DoubleUnaryOperator, java.util.function.DoubleUnaryOperator);















    ctor public ColorSpace.Rgb(java.lang.String, float[], float[], java.util.function.DoubleUnaryOperator, java.util.function.DoubleUnaryOperator, float, float);

























graphics/java/android/graphics/ColorSpace.java



+5
−30




























Original line number
Diff line number
Diff line








@@ -123,39 +123,11 @@ import java.util.function.DoubleUnaryOperator;













 * and {@link #connect(ColorSpace, ColorSpace)}, are also guaranteed to be















 * thread-safe.</p>















 *













 * <h3>Visualization and debugging</h3>













 *













 * <p>To visualize and debug color spaces, you can call {@link #createRenderer()}.













 * The {@link Renderer} created by calling this method can be used to compare













 * color spaces and locate specific colors on a CIE 1931 or CIE 1976 UCS













 * chromaticity diagram.</p>













 *













 * <p>The following code snippet shows how to render a bitmap that compares













 * the color gamuts and white points of {@link Named#DCI_P3} and













 * {@link Named#PRO_PHOTO_RGB}:</p>













 *













 * <pre class="prettyprint">













 * Bitmap bitmap = ColorSpace.createRenderer()













 *     .size(768)













 *     .clip(true)













 *     .add(ColorSpace.get(ColorSpace.Named.DCI_P3), 0xffffc845)













 *     .add(ColorSpace.get(ColorSpace.Named.PRO_PHOTO_RGB), 0xff097ae9)













 *     .render();













 * </pre>













 * <p>













 *     <img style="display: block; margin: 0 auto;" src="{@docRoot}reference/android/images/graphics/colorspace_renderer.png" />













 *     <figcaption style="text-align: center;">DCI-P3 vs ProPhoto RGB</figcaption>













 * </p>













 *













 * <p>Please refer to the documentation of the {@link Renderer} class for more













 * information about its options and capabilities.</p>













 *















 * @see #get(Named)















 * @see Named















 * @see Model















 * @see Connector















 * @see Adaptation













 * @see Renderer















 */















@AnyThread















@SuppressWarnings("StaticInitializerReferencesSubClass")










@@ -1417,6 +1389,8 @@ public abstract class ColorSpace {













     * @return A new non-null {@link Renderer} instance















     *















     * @see Renderer













     *













     * @hide















     */















    @NonNull















    public static Renderer createRenderer() {










@@ -3712,6 +3686,8 @@ public abstract class ColorSpace {













     * See {@link #add(ColorSpace, float, float, float, int)} for more information.</p>















     *















     * @see ColorSpace#createRenderer()













     *













     * @hide















     */















    public static class Renderer {















        private static final int NATIVE_SIZE = 1440;










@@ -4054,7 +4030,7 @@ public abstract class ColorSpace {













         */















        @NonNull















        @Size(6)













        private static float[] getPrimaries(@NonNull Rgb rgb,













        private static void getPrimaries(@NonNull Rgb rgb,















                @NonNull @Size(6) float[] primaries, boolean asUcs) {















            // TODO: We should find a better way to handle these cases















            if (rgb.equals(ColorSpace.get(Named.EXTENDED_SRGB)) ||









@@ -4069,7 +4045,6 @@ public abstract class ColorSpace {













                rgb.getPrimaries(primaries);















            }















            if (asUcs) xyYToUv(primaries);













            return primaries;















        }































        /**