From 5b3a42319c20929a075a71de92fa8b7cdafd0ae8 Mon Sep 17 00:00:00 2001 From: Mihai Popa Date: Thu, 17 May 2018 16:42:22 +0100 Subject: [PATCH] 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 --- core/java/android/widget/TextView.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index a538f7fa3c875..9bdd76bcdcc80 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -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