diff options
| author | 2017-09-14 17:59:24 +0000 | |
|---|---|---|
| committer | 2017-09-14 17:59:24 +0000 | |
| commit | 273dcbf053d3fb8cf5b7069b4d75a284583dcd81 (patch) | |
| tree | bcc3048dd3756f070c269e5556a10a76b8829eae | |
| parent | a51e0d3b933701e95bdce05ef97c9357964f0793 (diff) | |
| parent | ae90cfccee12153eed04c731093c322ff9565621 (diff) | |
Merge "Fix maxLines/lines properties for BoringLayout" into oc-mr1-dev
am: ae90cfccee
Change-Id: I6c0070008432277fbb6ee6ce010c4933e2a7d735
| -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) { |