Remove Rasterizer and its subclasses from the public API.
Test: compile
Bug: 14650725
Change-Id: I99e1942d4d1b85f4efdcb3faf3fee1aa6c839b7e
diff --git a/api/current.txt b/api/current.txt
index c294d8a..5a5eb25 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -12245,12 +12245,6 @@
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);
}
@@ -12412,7 +12406,6 @@
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();
@@ -12469,7 +12462,6 @@
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);
@@ -12776,10 +12768,6 @@
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);
@@ -39952,12 +39940,6 @@
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);
diff --git a/api/removed.txt b/api/removed.txt
index 683a695..10e6eb5 100644
--- a/api/removed.txt
+++ b/api/removed.txt
@@ -78,10 +78,25 @@
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.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 {
diff --git a/api/system-current.txt b/api/system-current.txt
index a3672b3..d71026a 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -12732,12 +12732,6 @@
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);
}
@@ -12899,7 +12893,6 @@
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();
@@ -12956,7 +12949,6 @@
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);
@@ -13263,10 +13255,6 @@
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);
@@ -43140,12 +43128,6 @@
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);
diff --git a/api/system-removed.txt b/api/system-removed.txt
index 98e7953..0919b8f 100644
--- a/api/system-removed.txt
+++ b/api/system-removed.txt
@@ -76,10 +76,25 @@
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.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 {
diff --git a/api/test-current.txt b/api/test-current.txt
index 11f1c5c..9f39f46 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -12276,12 +12276,6 @@
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);
}
@@ -12443,7 +12437,6 @@
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();
@@ -12500,7 +12493,6 @@
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);
@@ -12807,10 +12799,6 @@
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);
@@ -40051,12 +40039,6 @@
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);
diff --git a/api/test-removed.txt b/api/test-removed.txt
index 683a695..10e6eb5 100644
--- a/api/test-removed.txt
+++ b/api/test-removed.txt
@@ -78,10 +78,25 @@
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.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 {