Merge "Fix maxLines/lines properties for BoringLayout" into oc-mr1-dev

am: ae90cfccee Change-Id: I6c0070008432277fbb6ee6ce010c4933e2a7d735
2017-09-14 17:59:24 +00:00
parent a51e0d3b93 ae90cfccee
commit 273dcbf053
1 changed files with 2 additions and 1 deletions
--- 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) {