Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix TextView#setText misplaced documentation"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-05-17 17:21:29 +00:00
committed by Android (Google) Code Review
parent da84578750 5b3a42319c
commit 8e69adbd07
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/widget/TextView.java
View File

@@ -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