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:15 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-06-06 10:59:15 -0700
commit0f0173f9e11297189a67ce4e33fb82f9434621cc (patch)
tree1fcd7b7c0c270198a2be9f521fd024bf40ada8f5 /core/java/android/widget/TextView.java
parent0d0a85c4571c5d9061c87d7c124ab5babf3f3d29 (diff)
parenta0d66cf3f698ebb08cb609a2d345983dfea24f19 (diff)
Merge "Clarify problems with Linkify.MAP_ADDRESSES." into qt-dev
am: a0d66cf3f6 Change-Id: I10e7f3f8d14d15e3dbc5fd6f97bafc7442c91bb4
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 a9e183ad5bf2..073965b35101 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -4960,6 +4960,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