diff options
| author | Victoria Lease <violets@google.com> | 2012-08-17 15:34:01 -0700 |
|---|---|---|
| committer | Victoria Lease <violets@google.com> | 2012-08-20 13:17:58 -0700 |
| commit | df8ef4b139a8918895f8a5c62536123da06e81fe (patch) | |
| tree | a2069be0733deb854f9cfcbf13777b4c603c7e0b /api | |
| parent | 6fb73ab83f9c1b745ccff4fb92babb429b9215ee (diff) | |
| download | frameworks_base-df8ef4b139a8918895f8a5c62536123da06e81fe.zip frameworks_base-df8ef4b139a8918895f8a5c62536123da06e81fe.tar.gz frameworks_base-df8ef4b139a8918895f8a5c62536123da06e81fe.tar.bz2 | |
DO NOT MERGE LocaleSpan makes Han disambiguation easy!
Cherry-pick of I7f1b0d49a2ece957a7b9b5d65d48385bf2c2a668 from master.
I've also provided TextView.setTextLocale() for use in single-language
TextViews.
Change-Id: I5692859bfd2aafc284172454d943afc250b22535
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index d6d1732..0c71009 100644 --- a/api/current.txt +++ b/api/current.txt @@ -22503,6 +22503,17 @@ package android.text.style { method public abstract void chooseHeight(java.lang.CharSequence, int, int, int, int, android.graphics.Paint.FontMetricsInt, android.text.TextPaint); } + public class LocaleSpan extends android.text.style.MetricAffectingSpan implements android.text.ParcelableSpan { + ctor public LocaleSpan(java.util.Locale); + ctor public LocaleSpan(android.os.Parcel); + method public int describeContents(); + method public java.util.Locale getLocale(); + method public int getSpanTypeId(); + method public void updateDrawState(android.text.TextPaint); + method public void updateMeasureState(android.text.TextPaint); + method public void writeToParcel(android.os.Parcel, int); + } + public class MaskFilterSpan extends android.text.style.CharacterStyle implements android.text.style.UpdateAppearance { ctor public MaskFilterSpan(android.graphics.MaskFilter); method public android.graphics.MaskFilter getMaskFilter(); @@ -29303,6 +29314,7 @@ package android.widget { method public static int getTextColor(android.content.Context, android.content.res.TypedArray, int); method public final android.content.res.ColorStateList getTextColors(); method public static android.content.res.ColorStateList getTextColors(android.content.Context, android.content.res.TypedArray); + method public java.util.Locale getTextLocale(); method public float getTextScaleX(); method public float getTextSize(); method public int getTotalPaddingBottom(); @@ -29405,6 +29417,7 @@ package android.widget { method public void setTextIsSelectable(boolean); method public final void setTextKeepState(java.lang.CharSequence); method public final void setTextKeepState(java.lang.CharSequence, android.widget.TextView.BufferType); + method public void setTextLocale(java.util.Locale); method public void setTextScaleX(float); method public void setTextSize(float); method public void setTextSize(int, float); |