Merge "Remove Rasterizer and its subclasses from the public API." (3eda170b) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −18

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

		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);
		}

		public class LightingColorFilter extends android.graphics.ColorFilter {
		ctor public LightingColorFilter(int, int);
		}
		@@ -12414,7 +12408,6 @@ package android.graphics {
		method public int getOffsetForAdvance(char[], int, int, int, int, boolean, float);
		method public int getOffsetForAdvance(java.lang.CharSequence, int, int, int, int, boolean, float);
		method public android.graphics.PathEffect getPathEffect();
		method public deprecated android.graphics.Rasterizer getRasterizer();
		method public float getRunAdvance(char[], int, int, int, int, boolean, int);
		method public float getRunAdvance(java.lang.CharSequence, int, int, int, int, boolean, int);
		method public android.graphics.Shader getShader();
		@@ -12471,7 +12464,6 @@ 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 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);
		@@ -12778,10 +12770,6 @@ package android.graphics {
		ctor public RadialGradient(float, float, float, int, int, android.graphics.Shader.TileMode);
		}

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

		public final class Rect implements android.os.Parcelable {
		ctor public Rect();
		ctor public Rect(int, int, int, int);
		@@ -39977,12 +39965,6 @@ package android.text.style {
		method public void writeToParcel(android.os.Parcel, int);
		}

		public class RasterizerSpan extends android.text.style.CharacterStyle implements android.text.style.UpdateAppearance {
		ctor public RasterizerSpan(android.graphics.Rasterizer);
		method public android.graphics.Rasterizer getRasterizer();
		method public void updateDrawState(android.text.TextPaint);
		}

		public class RelativeSizeSpan extends android.text.style.MetricAffectingSpan implements android.text.ParcelableSpan {
		ctor public RelativeSizeSpan(float);
		ctor public RelativeSizeSpan(android.os.Parcel);

api/removed.txt

+24 −0

Original line number	Diff line number	Diff line
		@@ -78,10 +78,25 @@ package android.graphics {
		enum_constant public static final android.graphics.AvoidXfermode.Mode TARGET;
		}

		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);
		}

		public class Paint {
		method public deprecated android.graphics.Rasterizer getRasterizer();
		method public deprecated android.graphics.Rasterizer setRasterizer(android.graphics.Rasterizer);
		}

		public deprecated class PixelXorXfermode extends android.graphics.Xfermode {
		ctor public PixelXorXfermode(int);
		}

		public class Rasterizer {
		ctor public Rasterizer();
		}

		}

		package android.location {
		@@ -393,6 +408,15 @@ package android.text.format {

		}

		package android.text.style {

		public class RasterizerSpan extends android.text.style.CharacterStyle implements android.text.style.UpdateAppearance {
		ctor public RasterizerSpan(android.graphics.Rasterizer);
		method public android.graphics.Rasterizer getRasterizer();
		}

		}

		package android.util {

		public deprecated class FloatMath {

api/system-current.txt

+0 −18

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

		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);
		}

		public class LightingColorFilter extends android.graphics.ColorFilter {
		ctor public LightingColorFilter(int, int);
		}
		@@ -12904,7 +12898,6 @@ package android.graphics {
		method public int getOffsetForAdvance(char[], int, int, int, int, boolean, float);
		method public int getOffsetForAdvance(java.lang.CharSequence, int, int, int, int, boolean, float);
		method public android.graphics.PathEffect getPathEffect();
		method public deprecated android.graphics.Rasterizer getRasterizer();
		method public float getRunAdvance(char[], int, int, int, int, boolean, int);
		method public float getRunAdvance(java.lang.CharSequence, int, int, int, int, boolean, int);
		method public android.graphics.Shader getShader();
		@@ -12961,7 +12954,6 @@ 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 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);
		@@ -13268,10 +13260,6 @@ package android.graphics {
		ctor public RadialGradient(float, float, float, int, int, android.graphics.Shader.TileMode);
		}

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

		public final class Rect implements android.os.Parcelable {
		ctor public Rect();
		ctor public Rect(int, int, int, int);
		@@ -43174,12 +43162,6 @@ package android.text.style {
		method public void writeToParcel(android.os.Parcel, int);
		}

		public class RasterizerSpan extends android.text.style.CharacterStyle implements android.text.style.UpdateAppearance {
		ctor public RasterizerSpan(android.graphics.Rasterizer);
		method public android.graphics.Rasterizer getRasterizer();
		method public void updateDrawState(android.text.TextPaint);
		}

		public class RelativeSizeSpan extends android.text.style.MetricAffectingSpan implements android.text.ParcelableSpan {
		ctor public RelativeSizeSpan(float);
		ctor public RelativeSizeSpan(android.os.Parcel);

api/system-removed.txt

+24 −0

Original line number	Diff line number	Diff line
		@@ -76,10 +76,25 @@ package android.graphics {
		enum_constant public static final android.graphics.AvoidXfermode.Mode TARGET;
		}

		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);
		}

		public class Paint {
		method public deprecated android.graphics.Rasterizer getRasterizer();
		method public deprecated android.graphics.Rasterizer setRasterizer(android.graphics.Rasterizer);
		}

		public deprecated class PixelXorXfermode extends android.graphics.Xfermode {
		ctor public PixelXorXfermode(int);
		}

		public class Rasterizer {
		ctor public Rasterizer();
		}

		}

		package android.location {
		@@ -387,6 +402,15 @@ package android.text.format {

		}

		package android.text.style {

		public class RasterizerSpan extends android.text.style.CharacterStyle implements android.text.style.UpdateAppearance {
		ctor public RasterizerSpan(android.graphics.Rasterizer);
		method public android.graphics.Rasterizer getRasterizer();
		}

		}

		package android.util {

		public deprecated class FloatMath {

api/test-current.txt

+0 −18

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

		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);
		}

		public class LightingColorFilter extends android.graphics.ColorFilter {
		ctor public LightingColorFilter(int, int);
		}
		@@ -12445,7 +12439,6 @@ package android.graphics {
		method public int getOffsetForAdvance(char[], int, int, int, int, boolean, float);
		method public int getOffsetForAdvance(java.lang.CharSequence, int, int, int, int, boolean, float);
		method public android.graphics.PathEffect getPathEffect();
		method public deprecated android.graphics.Rasterizer getRasterizer();
		method public float getRunAdvance(char[], int, int, int, int, boolean, int);
		method public float getRunAdvance(java.lang.CharSequence, int, int, int, int, boolean, int);
		method public android.graphics.Shader getShader();
		@@ -12502,7 +12495,6 @@ 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 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);
		@@ -12809,10 +12801,6 @@ package android.graphics {
		ctor public RadialGradient(float, float, float, int, int, android.graphics.Shader.TileMode);
		}

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

		public final class Rect implements android.os.Parcelable {
		ctor public Rect();
		ctor public Rect(int, int, int, int);
		@@ -40076,12 +40064,6 @@ package android.text.style {
		method public void writeToParcel(android.os.Parcel, int);
		}

		public class RasterizerSpan extends android.text.style.CharacterStyle implements android.text.style.UpdateAppearance {
		ctor public RasterizerSpan(android.graphics.Rasterizer);
		method public android.graphics.Rasterizer getRasterizer();
		method public void updateDrawState(android.text.TextPaint);
		}

		public class RelativeSizeSpan extends android.text.style.MetricAffectingSpan implements android.text.ParcelableSpan {
		ctor public RelativeSizeSpan(float);
		ctor public RelativeSizeSpan(android.os.Parcel);