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

Commit 108b013a authored by Siyamed Sinir's avatar Siyamed Sinir
Browse files

Revert "Fix TextView layout reuse when maxLines is set" 

This reverts commit f75775ea.

Bug: 28885989
Bug: 28468120
Change-Id: I6fa5401c8a76db1bacc2d8201eece91a3c52b758
parent f75775ea

core/java/android/widget/TextView.java

+4 −9
Original line number Diff line number Diff line
@@ -6983,19 +6983,14 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        return false;

    }



    private static int desired(Layout layout, int maxLines) {

    private static int desired(Layout layout) {

        int n = layout.getLineCount();

        CharSequence text = layout.getText();

        float max = 0;



        // if maxLines is set, and the text length is greater that the length of the text in the

        // layout, it means that there is a cut-off and we cannot use it.

        if (maxLines != -1 && text.length() > layout.getLineEnd(n - 1)) {

            return -1;

        }



        // if any line was wrapped, we can't use it.

        // but it's ok for the last line not to have a newline



        for (int i = 0; i < n - 1; i++) {

            if (text.charAt(layout.getLineEnd(i) - 1) != '\n')

                return -1;
@@ -7068,7 +7063,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
            width = widthSize;

        } else {

            if (mLayout != null && mEllipsize == null) {

                des = desired(mLayout, getMaxLines());

                des = desired(mLayout);

            }



            if (des < 0) {
@@ -7100,7 +7095,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
                int hintWidth;



                if (mHintLayout != null && mEllipsize == null) {

                    hintDes = desired(mHintLayout, getMaxLines());

                    hintDes = desired(mHintLayout);

                }



                if (hintDes < 0) {