Merge "Remove Rasterizer and its subclasses from the public API."
diff --git a/api/26.txt b/api/26.txt
index 3e517d2..4fb216a 100644
--- a/api/26.txt
+++ b/api/26.txt
@@ -11952,12 +11952,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);
}
@@ -12119,7 +12113,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();
@@ -12176,7 +12169,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);
@@ -12482,10 +12474,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);
@@ -39389,12 +39377,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/system-api/26.txt b/system-api/26.txt
index 46b1efe..a2f627e 100644
--- a/system-api/26.txt
+++ b/system-api/26.txt
@@ -12399,12 +12399,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);
}
@@ -12566,7 +12560,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();
@@ -12623,7 +12616,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);
@@ -12929,10 +12921,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);
@@ -42507,12 +42495,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);