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

Commit 5b3a4231 authored by Mihai Popa's avatar Mihai Popa
Browse files

Fix TextView#setText misplaced documentation 

In Ifaddb46d156c495a371789c6f32cfd67ffaaaef2, we improved the
documentation of TextView#setText to state an assumption that should
hold when subclasses override the method. However, the new phrase was
put in the wrong place. This CL fixes this.

Bug: none
Test: none
Change-Id: I918a6c533b9e4b34b3977a20e979a10db9741ebc
parent 1119ef3b

core/java/android/widget/TextView.java

+5 −10
Original line number Original line 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

     * PrecomputedText mismatches with this TextView, IllegalArgumentException is thrown. To ensure

     * the parameters match, you can call {@link TextView#setTextMetricsParams} before calling this.

     * 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

     * @param text text to be displayed

     *

     *

     * @attr ref android.R.styleable#TextView_text

     * @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 android.text.Editable.Factory} to create final or intermediate

     * {@link Editable Editables}.

     * {@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 text text to be displayed

     *

     *

     * @see #setText(CharSequence)

     * @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 android.text.Editable.Factory} to create final or intermediate

     * {@link Editable Editables}.

     * {@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 text text to be displayed

     * @param type a {@link android.widget.TextView.BufferType} which defines whether the text is

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

     *              stored as a static text, styleable/spannable text, or editable text