From 1f575b890e5ec82e93acc98a86eb21bf7a062977 Mon Sep 17 00:00:00 2001 From: Siyamed Sinir Date: Tue, 3 May 2016 20:27:21 +0000 Subject: [PATCH] Revert "Request re-layout after setText if layout width is 0" This reverts commit 375366cb2d6b8be3d81e59ea0ce27332c3eada66. Bug: 28523980 Change-Id: Ib4dd00eabaf7b5630b18373cc1d7bec61c0e155d --- core/java/android/widget/TextView.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 8097d7a1ea85c..48fd58b219db6 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -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 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)) {