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

Commit 8cd69a4c authored by Siyamed Sinir's avatar Siyamed Sinir Committed by android-build-merger
Browse files

Merge "Revert "Request re-layout after setText if layout width is 0"" into... 

Merge "Revert "Request re-layout after setText if layout width is 0"" into nyc-dev am: c18009e6 am: 553aae25
am: 66850473

* commit '66850473':
  Revert "Request re-layout after setText if layout width is 0"

Change-Id: I9511aced9abc8d8c250959069bfe8a862eb29689
parents 39a52792 66850473

core/java/android/widget/TextView.java

+1 −1
Original line number Diff line number Diff line
@@ -7311,7 +7311,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 the text height stays the same or if the view height is fixed.



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

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

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

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

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