Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2e38ce2 authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi
Browse files

Fix: Wrong TextView height when DynamicLayout is used. 

When DynamicLayout is used, max line is not set for
computing layout even if TextView has the limit. So, we
still need to use getLineTop in getDesiredHeight.
This bug was introduced by I1e1cae31cf33d503a8cf.

Bug: 34279529
Test: manually tested
Test: android.widget.cts.TextViewTest

Change-Id: I9b7a3c46e7671a84e6a830eb962a49d2b0856eab
parent 27379c0f

core/java/android/widget/TextView.java

+13 −2
Original line number Diff line number Diff line
@@ -7722,14 +7722,25 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
            desired = Math.max(desired, dr.mDrawableHeightRight);

        }



        desired += getCompoundPaddingTop() + getCompoundPaddingBottom();

        int linecount = layout.getLineCount();

        final int padding = getCompoundPaddingTop() + getCompoundPaddingBottom();

        desired += padding;



        if (mMaxMode != LINES) {

            desired = Math.min(desired, mMaximum);

        } else if (cap && linecount > mMaximum && layout instanceof DynamicLayout) {

            desired = layout.getLineTop(mMaximum);



            if (dr != null) {

                desired = Math.max(desired, dr.mDrawableHeightLeft);

                desired = Math.max(desired, dr.mDrawableHeightRight);

            }



            desired += padding;

            linecount = mMaximum;

        }



        if (mMinMode == LINES) {

            int linecount = layout.getLineCount();

            if (linecount < mMinimum) {

                desired += getLineHeight() * (mMinimum - linecount);

            }