Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add descriptive toString method and missing accessors"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-07-01 01:27:28 +00:00
committed by Android (Google) Code Review
parent 0b81e609d6 0561027f9a
commit 106145fc27
25 changed files with 203 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/api/current.txt
View File

@@ -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();

6
core/java/android/text/style/AbsoluteSizeSpan.java
View File

@@ -130,4 +130,10 @@ public class AbsoluteSizeSpan extends MetricAffectingSpan implements ParcelableS
ds.setTextSize(mSize);
}
}
@Override
public String toString() {
return "AbsoluteSizeSpan{size=" + getSize() + ", isDip=" + getDip() + '}';
}
}

5
core/java/android/text/style/AlignmentSpan.java
View File

@@ -101,5 +101,10 @@ public interface AlignmentSpan extends ParagraphStyle {
public Layout.Alignment getAlignment() {
return mAlignment;
}
@Override
public String toString() {
return "AlignmentSpan.Standard{alignment=" + getAlignment() + '}';
}
}
}

5
core/java/android/text/style/BackgroundColorSpan.java
View File

@@ -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()) + '}';
}
}

9
core/java/android/text/style/BulletSpan.java
View File

@@ -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())
+ '}';
}
}

5
core/java/android/text/style/ClickableSpan.java
View File

@@ -64,4 +64,9 @@ public abstract class ClickableSpan extends CharacterStyle implements UpdateAppe
public int getId() {
return mId;
}
@Override
public String toString() {
return "ClickableSpan{}";
}
}

21
core/java/android/text/style/DrawableMarginSpan.java
View File

@@ -112,4 +112,25 @@ public class DrawableMarginSpan implements LeadingMarginSpan, LineHeightSpan {
}
}
}
@Override
public String toString() {
return "DrawableMarginSpan{drawable=" + mDrawable + ", padding=" + mPad + '}';
}
/**
* Returns the drawable used.
* @return a drawable
*/
@NonNull public Drawable getDrawable() {
return mDrawable;
}
/**
* Returns a distance between the drawable and text in pixel.
* @return a distance pixel from the text
*/
@Px public int getPadding() {
return mPad;
}
}

8
core/java/android/text/style/DynamicDrawableSpan.java
View File

@@ -189,5 +189,13 @@ public abstract class DynamicDrawableSpan extends ReplacementSpan {
return d;
}
@Override
public String toString() {
return "DynamicDrawableSpan{"
+ "verticalAlignment=" + getVerticalAlignment()
+ ", drawable=" + getDrawable()
+ '}';
}
}

5
core/java/android/text/style/ForegroundColorSpan.java
View File

@@ -101,4 +101,9 @@ public class ForegroundColorSpan extends CharacterStyle
public void updateDrawState(@NonNull TextPaint textPaint) {
textPaint.setColor(mColor);
}
@Override
public String toString() {
return "ForegroundColorSpan{color=#" + String.format("%08X", getForegroundColor()) + '}';
}
}

20
core/java/android/text/style/IconMarginSpan.java
View File

@@ -110,4 +110,24 @@ public class IconMarginSpan implements LeadingMarginSpan, LineHeightSpan {
}
}
@Override
public String toString() {
return "IconMarginSpan{bitmap=" + getBitmap() + ", padding=" + getPadding() + '}';
}
/**
* Returns the bitmap to be used at the beginning of the text
* @return a bitmap
*/
@NonNull public Bitmap getBitmap() {
return mBitmap;
}
/**
* Returns the padding width between the bitmap and the text.
* @return a padding width in pixels
*/
@Px public int getPadding() {
return mPad;
}
}

9
core/java/android/text/style/ImageSpan.java
View File

@@ -266,4 +266,13 @@ public class ImageSpan extends DynamicDrawableSpan {
public String getSource() {
return mSource;
}
@Override
public String toString() {
return "ImageSpan{"
+ "drawable=" + getDrawable()
+ ", source='" + getSource() + '\''
+ ", verticalAlignment=" + getVerticalAlignment()
+ '}';
}
}

5
core/java/android/text/style/LocaleSpan.java
View File

@@ -126,4 +126,9 @@ public class LocaleSpan extends MetricAffectingSpan implements ParcelableSpan {
private static void apply(@NonNull Paint paint, @NonNull LocaleList locales) {
paint.setTextLocales(locales);
}
@Override
public String toString() {
return "LocaleSpan{locales=" + getLocales() + '}';
}
}

5
core/java/android/text/style/MaskFilterSpan.java
View File

@@ -56,4 +56,9 @@ public class MaskFilterSpan extends CharacterStyle implements UpdateAppearance {
public void updateDrawState(TextPaint ds) {
ds.setMaskFilter(mFilter);
}
@Override
public String toString() {
return "MaskFilterSpan{filter=" + getMaskFilter() + '}';
}
}

9
core/java/android/text/style/QuoteSpan.java
View File

@@ -203,4 +203,13 @@ public class QuoteSpan implements LeadingMarginSpan, ParcelableSpan {
p.setStyle(style);
p.setColor(color);
}
@Override
public String toString() {
return "QuoteSpan{"
+ "color=" + String.format("#%08X", getColor())
+ ", stripeWidth=" + getStripeWidth()
+ ", gapWidth=" + getGapWidth()
+ '}';
}
}

5
core/java/android/text/style/RelativeSizeSpan.java
View File

@@ -97,4 +97,9 @@ public class RelativeSizeSpan extends MetricAffectingSpan implements ParcelableS
public void updateMeasureState(@NonNull TextPaint ds) {
ds.setTextSize(ds.getTextSize() * mProportion);
}
@Override
public String toString() {
return "RelativeSizeSpan{proportion=" + getSizeChange() + '}';
}
}

5
core/java/android/text/style/ScaleXSpan.java
View File

@@ -102,4 +102,9 @@ public class ScaleXSpan extends MetricAffectingSpan implements ParcelableSpan {
public void updateMeasureState(TextPaint ds) {
ds.setTextScaleX(ds.getTextScaleX() * mProportion);
}
@Override
public String toString() {
return "ScaleXSpan{scaleX=" + getScaleX() + '}';
}
}

5
core/java/android/text/style/StrikethroughSpan.java
View File

@@ -77,4 +77,9 @@ public class StrikethroughSpan extends CharacterStyle
public void updateDrawState(@NonNull TextPaint ds) {
ds.setStrikeThruText(true);
}
@Override
public String toString() {
return "StrikethroughSpan{}";
}
}

8
core/java/android/text/style/StyleSpan.java
View File

@@ -185,4 +185,12 @@ public class StyleSpan extends MetricAffectingSpan implements ParcelableSpan {
paint.setTypeface(tf);
}
@Override
public String toString() {
return "StyleSpan{"
+ "style=" + getStyle()
+ ", fontWeightAdjustment=" + getFontWeightAdjustment()
+ '}';
}
}

5
core/java/android/text/style/SubscriptSpan.java
View File

@@ -86,4 +86,9 @@ public class SubscriptSpan extends MetricAffectingSpan implements ParcelableSpan
public void updateMeasureState(@NonNull TextPaint textPaint) {
textPaint.baselineShift -= (int) (textPaint.ascent() / 2);
}
@Override
public String toString() {
return "SubscriptSpan{}";
}
}

5
core/java/android/text/style/SuperscriptSpan.java
View File

@@ -83,4 +83,9 @@ public class SuperscriptSpan extends MetricAffectingSpan implements ParcelableSp
public void updateMeasureState(@NonNull TextPaint textPaint) {
textPaint.baselineShift += (int) (textPaint.ascent() / 2);
}
@Override
public String toString() {
return "SuperscriptSpan{}";
}
}

5
core/java/android/text/style/TabStopSpan.java
View File

@@ -65,5 +65,10 @@ public interface TabStopSpan extends ParagraphStyle {
public int getTabStop() {
return mTabOffset;
}
@Override
public String toString() {
return "TabStopSpan.Standard{tabOffset=" + getTabStop() + '}';
}
}
}

30
core/java/android/text/style/TextAppearanceSpan.java
View File

@@ -442,6 +442,14 @@ public class TextAppearanceSpan extends MetricAffectingSpan implements Parcelabl
return mElegantTextHeight;
}
/**
* Returns the value of letter spacing to be added in em unit.
* @return a letter spacing amount
*/
public float getLetterSpacing() {
return mLetterSpacing;
}
@Override
public void updateDrawState(TextPaint ds) {
updateMeasureState(ds);
@@ -534,4 +542,26 @@ public class TextAppearanceSpan extends MetricAffectingSpan implements Parcelabl
ds.setFontVariationSettings(mFontVariationSettings);
}
}
@Override
public String toString() {
return "TextAppearanceSpan{"
+ "familyName='" + getFamily() + '\''
+ ", style=" + getTextStyle()
+ ", textSize=" + getTextSize()
+ ", textColor=" + getTextColor()
+ ", textColorLink=" + getLinkTextColor()
+ ", typeface=" + getTypeface()
+ ", textFontWeight=" + getTextFontWeight()
+ ", textLocales=" + getTextLocales()
+ ", shadowRadius=" + getShadowRadius()
+ ", shadowDx=" + getShadowDx()
+ ", shadowDy=" + getShadowDy()
+ ", shadowColor=" + String.format("#%08X", getShadowColor())
+ ", elegantTextHeight=" + isElegantTextHeight()
+ ", letterSpacing=" + getLetterSpacing()
+ ", fontFeatureSettings='" + getFontFeatureSettings() + '\''
+ ", fontVariationSettings='" + getFontVariationSettings() + '\''
+ '}';
}
}

8
core/java/android/text/style/TypefaceSpan.java
View File

@@ -180,4 +180,12 @@ public class TypefaceSpan extends MetricAffectingSpan implements ParcelableSpan
}
paint.setTypeface(styledTypeface);
}
@Override
public String toString() {
return "TypefaceSpan{"
+ "family='" + getFamily() + '\''
+ ", typeface=" + getTypeface()
+ '}';
}
}

5
core/java/android/text/style/URLSpan.java
View File

@@ -109,4 +109,9 @@ public class URLSpan extends ClickableSpan implements ParcelableSpan {
Log.w("URLSpan", "Actvity was not found for intent, " + intent.toString());
}
}
@Override
public String toString() {
return "URLSpan{" + "URL='" + getURL() + '\'' + '}';
}
}

5
core/java/android/text/style/UnderlineSpan.java
View File

@@ -77,4 +77,9 @@ public class UnderlineSpan extends CharacterStyle
public void updateDrawState(@NonNull TextPaint ds) {
ds.setUnderlineText(true);
}
@Override
public String toString() {
return "UnderlineSpan{}";
}
}