Merge "document and deprecated Rasterizer" (ca262412) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −4

Original line number	Diff line number	Diff line
		@@ -10092,7 +10092,7 @@ package android.graphics {
		enum_constant public static final android.graphics.Interpolator.Result NORMAL;
		}

		public class LayerRasterizer extends android.graphics.Rasterizer {
		public deprecated class LayerRasterizer extends android.graphics.Rasterizer {
		ctor public LayerRasterizer();
		method public void addLayer(android.graphics.Paint, float, float);
		method public void addLayer(android.graphics.Paint);
		@@ -10252,7 +10252,7 @@ package android.graphics {
		method public int getHinting();
		method public android.graphics.MaskFilter getMaskFilter();
		method public android.graphics.PathEffect getPathEffect();
		method public android.graphics.Rasterizer getRasterizer();
		method public deprecated android.graphics.Rasterizer getRasterizer();
		method public android.graphics.Shader getShader();
		method public android.graphics.Paint.Cap getStrokeCap();
		method public android.graphics.Paint.Join getStrokeJoin();
		@@ -10303,7 +10303,7 @@ package android.graphics {
		method public void setLinearText(boolean);
		method public android.graphics.MaskFilter setMaskFilter(android.graphics.MaskFilter);
		method public android.graphics.PathEffect setPathEffect(android.graphics.PathEffect);
		method public android.graphics.Rasterizer setRasterizer(android.graphics.Rasterizer);
		method public deprecated android.graphics.Rasterizer setRasterizer(android.graphics.Rasterizer);
		method public android.graphics.Shader setShader(android.graphics.Shader);
		method public void setShadowLayer(float, float, float, int);
		method public void setStrikeThruText(boolean);
		@@ -10612,7 +10612,7 @@ package android.graphics {
		ctor public RadialGradient(float, float, float, int, int, android.graphics.Shader.TileMode);
		}

		public class Rasterizer {
		public deprecated class Rasterizer {
		ctor public Rasterizer();
		}

graphics/java/android/graphics/LayerRasterizer.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.graphics;

		@Deprecated
		public class LayerRasterizer extends Rasterizer {
		public LayerRasterizer() {
		native_instance = nativeConstructor();

graphics/java/android/graphics/Paint.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -1071,7 +1071,10 @@ public class Paint {
		* The raster controls/modifies how paths/text are turned into alpha masks.
		*
		* @return the paint's rasterizer (or null)
		*
		* @deprecated Rasterizer is not supported by either the HW or PDF backends.
		*/
		@Deprecated
		public Rasterizer getRasterizer() {
		return mRasterizer;
		}
		@@ -1085,7 +1088,10 @@ public class Paint {
		* @param rasterizer May be null. The new rasterizer to be installed in
		* the paint.
		* @return rasterizer
		*
		* @deprecated Rasterizer is not supported by either the HW or PDF backends.
		*/
		@Deprecated
		public Rasterizer setRasterizer(Rasterizer rasterizer) {
		long rasterizerNative = 0;
		if (rasterizer != null) {

graphics/java/android/graphics/Rasterizer.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@

		package android.graphics;

		@Deprecated
		public class Rasterizer {

		protected void finalize() throws Throwable {