Merge "Add descriptive toString method and missing accessors" (106145fc) · Commits · e / os / android_frameworks_base

core/api/current.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -46003,7 +46003,9 @@ package android.text.style {
		ctor public DrawableMarginSpan(@NonNull android.graphics.drawable.Drawable, int);
		method public void chooseHeight(@NonNull CharSequence, int, int, int, int, @NonNull android.graphics.Paint.FontMetricsInt);
		method public void drawLeadingMargin(@NonNull android.graphics.Canvas, @NonNull android.graphics.Paint, int, int, int, int, int, @NonNull CharSequence, int, int, boolean, @NonNull android.text.Layout);
		method @NonNull public android.graphics.drawable.Drawable getDrawable();
		method public int getLeadingMargin(boolean);
		method @Px public int getPadding();
		}

		public abstract class DynamicDrawableSpan extends android.text.style.ReplacementSpan {
		@@ -46046,7 +46048,9 @@ package android.text.style {
		ctor public IconMarginSpan(@NonNull android.graphics.Bitmap, @IntRange(from=0) int);
		method public void chooseHeight(CharSequence, int, int, int, int, android.graphics.Paint.FontMetricsInt);
		method public void drawLeadingMargin(android.graphics.Canvas, android.graphics.Paint, int, int, int, int, int, CharSequence, int, int, boolean, android.text.Layout);
		method @NonNull public android.graphics.Bitmap getBitmap();
		method public int getLeadingMargin(boolean);
		method @Px public int getPadding();
		}

		public class ImageSpan extends android.text.style.DynamicDrawableSpan {
		@@ -46294,6 +46298,7 @@ package android.text.style {
		method public String getFamily();
		method @Nullable public String getFontFeatureSettings();
		method @Nullable public String getFontVariationSettings();
		method public float getLetterSpacing();
		method public android.content.res.ColorStateList getLinkTextColor();
		method public int getShadowColor();
		method public float getShadowDx();

core/java/android/text/style/AbsoluteSizeSpan.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -130,4 +130,10 @@ public class AbsoluteSizeSpan extends MetricAffectingSpan implements ParcelableS
		ds.setTextSize(mSize);
		}
		}


		@Override
		public String toString() {
		return "AbsoluteSizeSpan{size=" + getSize() + ", isDip=" + getDip() + '}';
		}
		}

core/java/android/text/style/AlignmentSpan.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -101,5 +101,10 @@ public interface AlignmentSpan extends ParagraphStyle {
		public Layout.Alignment getAlignment() {
		return mAlignment;
		}

		@Override
		public String toString() {
		return "AlignmentSpan.Standard{alignment=" + getAlignment() + '}';
		}
		}
		}

core/java/android/text/style/BackgroundColorSpan.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -100,4 +100,9 @@ public class BackgroundColorSpan extends CharacterStyle
		public void updateDrawState(@NonNull TextPaint textPaint) {
		textPaint.bgColor = mColor;
		}

		@Override
		public String toString() {
		return "BackgroundColorSpan{color=#" + String.format("%08X", getBackgroundColor()) + '}';
		}
		}

core/java/android/text/style/BulletSpan.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -235,4 +235,13 @@ public class BulletSpan implements LeadingMarginSpan, ParcelableSpan {
		paint.setStyle(style);
		}
		}

		@Override
		public String toString() {
		return "BulletSpan{"
		+ "gapWidth=" + getGapWidth()
		+ ", bulletRadius=" + getBulletRadius()
		+ ", color=" + String.format("%08X", getColor())
		+ '}';
		}
		}