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

Commit 375366cb authored by Siyamed Sinir's avatar Siyamed Sinir
Browse files

Request re-layout after setText if layout width is 0 

When TextView is in a layout with weight params (i.e. LinearLayout) and
the width is set to 0, do not try to prevent requestLayout.

Bug: 27995311
Change-Id: Idfe9d8d0b595a6db95beb1afd83ca96a2bd46546
parent 8dd32a56

core/java/android/widget/TextView.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -7310,7 +7310,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        // If we have a fixed width, we can just swap in a new text layout

        // If we have a fixed width, we can just swap in a new text layout

        // if the text height stays the same or if the view height is fixed.

        // if the text height stays the same or if the view height is fixed.





        if ((mLayoutParams.width != LayoutParams.WRAP_CONTENT ||

        if (((mLayoutParams.width != LayoutParams.WRAP_CONTENT && mLayoutParams.width != 0) ||

                (mMaxWidthMode == mMinWidthMode && mMaxWidth == mMinWidth)) &&

                (mMaxWidthMode == mMinWidthMode && mMaxWidth == mMinWidth)) &&

                (mHint == null || mHintLayout != null) &&

                (mHint == null || mHintLayout != null) &&

                (mRight - mLeft - getCompoundPaddingLeft() - getCompoundPaddingRight() > 0)) {

                (mRight - mLeft - getCompoundPaddingLeft() - getCompoundPaddingRight() > 0)) {