Merge "Hide ColorSpace.Renderer" into oc-dev (5094caaf) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -12821,7 +12821,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, 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);
	method public static android.graphics.ColorSpace.Connector connect(android.graphics.ColorSpace, android.graphics.ColorSpace.RenderIntent);		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 float[] fromXyz(float, float, float);
	method public abstract float[] fromXyz(float[]);		method public abstract float[] fromXyz(float[]);
	method public static android.graphics.ColorSpace get(android.graphics.ColorSpace.Named);		method public static android.graphics.ColorSpace get(android.graphics.ColorSpace.Named);
	@@ -12905,16 +12904,6 @@ package android.graphics {
	enum_constant public static final android.graphics.ColorSpace.RenderIntent SATURATION;		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 {		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[], 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);		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	Original line	Diff line number	Diff line
	@@ -13584,7 +13584,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, 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);
	method public static android.graphics.ColorSpace.Connector connect(android.graphics.ColorSpace, android.graphics.ColorSpace.RenderIntent);		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 float[] fromXyz(float, float, float);
	method public abstract float[] fromXyz(float[]);		method public abstract float[] fromXyz(float[]);
	method public static android.graphics.ColorSpace get(android.graphics.ColorSpace.Named);		method public static android.graphics.ColorSpace get(android.graphics.ColorSpace.Named);
	@@ -13668,16 +13667,6 @@ package android.graphics {
	enum_constant public static final android.graphics.ColorSpace.RenderIntent SATURATION;		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 {		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[], 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);		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	Original line	Diff line number	Diff line
	@@ -12871,7 +12871,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, 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);
	method public static android.graphics.ColorSpace.Connector connect(android.graphics.ColorSpace, android.graphics.ColorSpace.RenderIntent);		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 float[] fromXyz(float, float, float);
	method public abstract float[] fromXyz(float[]);		method public abstract float[] fromXyz(float[]);
	method public static android.graphics.ColorSpace get(android.graphics.ColorSpace.Named);		method public static android.graphics.ColorSpace get(android.graphics.ColorSpace.Named);
	@@ -12955,16 +12954,6 @@ package android.graphics {
	enum_constant public static final android.graphics.ColorSpace.RenderIntent SATURATION;		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 {		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[], 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);		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	Original line	Diff line number	Diff line
	@@ -123,39 +123,11 @@ import java.util.function.DoubleUnaryOperator;
	* and {@link #connect(ColorSpace, ColorSpace)}, are also guaranteed to be		* and {@link #connect(ColorSpace, ColorSpace)}, are also guaranteed to be
	* thread-safe.</p>		* 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 #get(Named)
	* @see Named		* @see Named
	* @see Model		* @see Model
	* @see Connector		* @see Connector
	* @see Adaptation		* @see Adaptation
	* @see Renderer
	*/		*/
	@AnyThread		@AnyThread
	@SuppressWarnings("StaticInitializerReferencesSubClass")		@SuppressWarnings("StaticInitializerReferencesSubClass")
	@@ -1417,6 +1389,8 @@ public abstract class ColorSpace {
	* @return A new non-null {@link Renderer} instance		* @return A new non-null {@link Renderer} instance
	*		*
	* @see Renderer		* @see Renderer
			*
			* @hide
	*/		*/
	@NonNull		@NonNull
	public static Renderer createRenderer() {		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 {@link #add(ColorSpace, float, float, float, int)} for more information.</p>
	*		*
	* @see ColorSpace#createRenderer()		* @see ColorSpace#createRenderer()
			*
			* @hide
	*/		*/
	public static class Renderer {		public static class Renderer {
	private static final int NATIVE_SIZE = 1440;		private static final int NATIVE_SIZE = 1440;
	@@ -4054,7 +4030,7 @@ public abstract class ColorSpace {
	*/		*/
	@NonNull		@NonNull
	@Size(6)		@Size(6)
	private static float[] getPrimaries(@NonNull Rgb rgb,		private static void getPrimaries(@NonNull Rgb rgb,
	@NonNull @Size(6) float[] primaries, boolean asUcs) {		@NonNull @Size(6) float[] primaries, boolean asUcs) {
	// TODO: We should find a better way to handle these cases		// TODO: We should find a better way to handle these cases
	if (rgb.equals(ColorSpace.get(Named.EXTENDED_SRGB)) \|\|		if (rgb.equals(ColorSpace.get(Named.EXTENDED_SRGB)) \|\|
	@@ -4069,7 +4045,6 @@ public abstract class ColorSpace {
	rgb.getPrimaries(primaries);		rgb.getPrimaries(primaries);
	}		}
	if (asUcs) xyYToUv(primaries);		if (asUcs) xyYToUv(primaries);
	return primaries;
	}		}

	/**		/**