summaryrefslogtreecommitdiff
path: root/core/java/android/widget/TextView.java
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2019-06-06 10:59:10 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-06-06 10:59:10 -0700
commita50d608b89f36b562a1c46b43caa9ede301c921c (patch)
treefe2706fb0dea259e13458f65ac73cdfbd8736d4d /core/java/android/widget/TextView.java
parent1cf7417590e4dc9a10f4a6dd6928f037a038972f (diff)
parenta0d66cf3f698ebb08cb609a2d345983dfea24f19 (diff)
Merge "Clarify problems with Linkify.MAP_ADDRESSES." into qt-dev
am: a0d66cf3f6 Change-Id: I264a589322b87b09a5d250f1a7e71b7f1795f3dd
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 383d9b4e9c41..f02034a4d569 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