summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2019-06-06 11:13:16 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-06-06 11:13:16 -0700
commita759af55a4861124b14a837aa91abd539f454888 (patch)
treeea46c8468657d47d8909f65d0933859205099bf0 /core/java/android/widget/TextView.java
parentb487f78c0ae0dac8a3077e231caf1ffaa1354803 (diff)
parentc2ed59a2da7010a6ba579b09687db93382b03e3b (diff)
Merge "Clarify problems with Linkify.MAP_ADDRESSES." into qt-dev am: a0d66cf3f6 am: 0f0173f9e1
am: c2ed59a2da Change-Id: Ibc2165020ad583db1c4488e68f8d688e9d7a8fe5
Diffstat (limited to 'core/java/android/widget/TextView.java')
-rw-r--r--core/java/android/widget/TextView.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 956f6948c59c..d24aef216463 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -4965,6 +4965,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
* android.text.util.Linkify#ALL Linkify.ALL} and peers for
* possible values.
*
+ * <p class="note"><b>Note:</b>
+ * {@link android.text.util.Linkify#MAP_ADDRESSES Linkify.MAP_ADDRESSES}
+ * is deprecated and should be avoided; see its documentation.
+ *
* @attr ref android.R.styleable#TextView_autoLink
*/
@android.view.RemotableViewMethod