From dcb33f1618a663a6aad2cce4c7faec1cc79d04a0 Mon Sep 17 00:00:00 2001 From: Siyamed Sinir Date: Wed, 13 Sep 2017 01:29:26 -0700 Subject: Fix maxLines/lines properties for BoringLayout Line height calculation with maxLines set to zero displayed a single line when BoringLayout was used. This CL fixes it to show zero lines. Test: Added related CTS tests to TextViewTest and EditTextText Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest Test: bit CtsWidgetTestCases:android.widget.cts.EditTextTest Bug: 65435738 Change-Id: Ic21eb50b31666b2dcc2398278010fa072ea1ff67 --- core/java/android/widget/TextView.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'core/java') 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) { -- cgit v1.2.3