am e1e0dc8e: Make sure we relayout the TextView when the text changes and marquee is enabled. (1503f739) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextView.java

+18 −16

Original line number	Diff line number	Diff line
		@@ -3964,8 +3964,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		mHighlightPath = new Path();

		if (selStart == selEnd) {
		if ((SystemClock.uptimeMillis() - mShowCursor) % (2 * BLINK)
		< BLINK) {
		if ((SystemClock.uptimeMillis() - mShowCursor) % (2 * BLINK) < BLINK) {
		if (mHighlightPathBogus) {
		mHighlightPath.reset();
		mLayout.getCursorPath(selStart, mHighlightPath, mText);
		@@ -5344,8 +5343,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		* will happen at measure).
		*/
		makeNewLayout(want, hintWant, UNKNOWN_BORING, UNKNOWN_BORING,
		mRight - mLeft - getCompoundPaddingLeft() - getCompoundPaddingRight(), false);
		mRight - mLeft - getCompoundPaddingLeft() - getCompoundPaddingRight(),
		false);

		if (mEllipsize != TextUtils.TruncateAt.MARQUEE) {
		// In a fixed-height view, so use our new text layout.
		if (mLayoutParams.height != LayoutParams.WRAP_CONTENT &&
		mLayoutParams.height != LayoutParams.FILL_PARENT) {
		@@ -5360,6 +5361,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		invalidate();
		return;
		}
		}

		// We lose: the height has changed and we have a dynamic height.
		// Request a new view layout using our new text layout.