Merge "Fix TextView#setText misplaced documentation" (8e69adbd) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextView.java

+5 −10

Original line number	Diff line number	Diff line
		@@ -5547,11 +5547,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		* PrecomputedText mismatches with this TextView, IllegalArgumentException is thrown. To ensure
		* the parameters match, you can call {@link TextView#setTextMetricsParams} before calling this.
		*
		* Subclasses overriding this method should ensure that the following post condition holds,
		* in order to guarantee the safety of the view's measurement and layout operations:
		* regardless of the input, after calling #setText both {@code mText} and {@code mTransformed}
		* will be different from {@code null}.
		*
		* @param text text to be displayed
		*
		* @attr ref android.R.styleable#TextView_text
		@@ -5574,11 +5569,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		* {@link android.text.Editable.Factory} to create final or intermediate
		* {@link Editable Editables}.
		*
		* Subclasses overriding this method should ensure that the following post condition holds,
		* in order to guarantee the safety of the view's measurement and layout operations:
		* regardless of the input, after calling #setText both {@code mText} and {@code mTransformed}
		* will be different from {@code null}.
		*
		* @param text text to be displayed
		*
		* @see #setText(CharSequence)
		@@ -5596,6 +5586,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		* {@link android.text.Editable.Factory} to create final or intermediate
		* {@link Editable Editables}.
		*
		* Subclasses overriding this method should ensure that the following post condition holds,
		* in order to guarantee the safety of the view's measurement and layout operations:
		* regardless of the input, after calling #setText both {@code mText} and {@code mTransformed}
		* will be different from {@code null}.
		*
		* @param text text to be displayed
		* @param type a {@link android.widget.TextView.BufferType} which defines whether the text is
		* stored as a static text, styleable/spannable text, or editable text