diff options
| author | 2017-09-14 17:34:02 +0000 | |
|---|---|---|
| committer | 2017-09-14 17:34:02 +0000 | |
| commit | ae90cfccee12153eed04c731093c322ff9565621 (patch) | |
| tree | 9ea3af01e343fd5e14e458d55df6766a032c1308 | |
| parent | bbe2753dbb3f79d005f0ac6e6e5cc87799743c73 (diff) | |
| parent | dcb33f1618a663a6aad2cce4c7faec1cc79d04a0 (diff) | |
Merge "Fix maxLines/lines properties for BoringLayout" into oc-mr1-dev
| -rw-r--r-- | core/java/android/widget/TextView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 11fe67c0564c..9826fa0b94a1 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -8409,7 +8409,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener if (mMaxMode != LINES) { desired = Math.min(desired, mMaximum); - } else if (cap && linecount > mMaximum && layout instanceof DynamicLayout) { + } else if (cap && linecount > mMaximum && (layout instanceof DynamicLayout + || layout instanceof BoringLayout)) { desired = layout.getLineTop(mMaximum); if (dr != null) { |