diff options
| author | 2017-04-18 14:20:24 +0000 | |
|---|---|---|
| committer | 2017-04-18 14:20:33 +0000 | |
| commit | 2ed861d560defda9d43081f2cb35f3112cce2092 (patch) | |
| tree | 10c881c43702a65bec5bf42b007e434632517584 | |
| parent | 25b7687771938d16529348242eddb7d7fdc796bd (diff) | |
| parent | f730651a22c8d057dd5a39e3a846b699e2f4d73f (diff) | |
Merge "AutoSize TextView - take horizontalScrolling into account" into oc-dev
| -rw-r--r-- | core/java/android/widget/TextView.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index f9f10af85b69..f1a3ff54ed80 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -8196,9 +8196,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener mTempTextPaint.set(getPaint()); mTempTextPaint.setTextSize(suggestedSizeInPx); + final int availableWidth = mHorizontallyScrolling + ? VERY_WIDE + : getMeasuredWidth() - getTotalPaddingLeft() - getTotalPaddingRight(); final StaticLayout.Builder layoutBuilder = StaticLayout.Builder.obtain( - text, 0, text.length(), mTempTextPaint, - getMeasuredWidth() - getTotalPaddingLeft() - getTotalPaddingRight()); + text, 0, text.length(), mTempTextPaint, availableWidth); layoutBuilder.setAlignment(getLayoutAlignment()) .setLineSpacing(getLineSpacingExtra(), getLineSpacingMultiplier()) |