diff options
| author | Andrei Stingaceanu <stg@google.com> | 2017-07-25 10:50:28 +0100 |
|---|---|---|
| committer | Andrei Stingaceanu <stg@google.com> | 2017-07-27 10:03:33 +0000 |
| commit | 6e82029a0fe348645e1a32ac5863eb8da3c0b497 (patch) | |
| tree | c7d98244a947a18aba07bdef986a9a23e22da2ff /core/java/android/widget/TextView.java | |
| parent | 7ef9f224e4e7c1bdca5f7b69541789dcd1d521d8 (diff) | |
AutoSize TextView - fix transformation method
AutoSize now takes the text transformation method into
account when measuring the view.
Bug: 63889588
Test: cts-tradefed run cts-dev -m CtsWidgetTestCases -t
android.widget.cts.TextViewTest#testAutoSizeCallers_setTransformationMethod
Change-Id: I52f4bf6ea2f45342efa04b742a9debdac69f9c4c
Diffstat (limited to 'core/java/android/widget/TextView.java')
| -rw-r--r-- | core/java/android/widget/TextView.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 243e21500206..b2e2e889d16c 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -8341,7 +8341,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } private boolean suggestedSizeFitsInSpace(int suggestedSizeInPx, RectF availableSpace) { - final CharSequence text = getText(); + final CharSequence text = mTransformed != null + ? mTransformed + : getText(); final int maxLines = getMaxLines(); if (mTempTextPaint == null) { mTempTextPaint = new TextPaint(); |