diff options
| author | quddusc <quddusc@google.com> | 2013-11-01 19:17:20 -0700 |
|---|---|---|
| committer | quddusc <quddusc@google.com> | 2013-11-01 19:17:20 -0700 |
| commit | 60737e950718d02f206a9da5928299e28df4e382 (patch) | |
| tree | 9f68c3c5fffaee401d1fbfa836156400dfea0b3b /samples/browseable/TextLinkify | |
| parent | f99585bddd07da98a018e70e29bad55e2204e6ea (diff) | |
| parent | 3943cdc9626911fe2732fedd5c85e920c6078a9f (diff) | |
| download | android_development-60737e950718d02f206a9da5928299e28df4e382.tar.gz android_development-60737e950718d02f206a9da5928299e28df4e382.tar.bz2 android_development-60737e950718d02f206a9da5928299e28df4e382.zip | |
Merge commit '3943cdc9' into manualmerge2
Conflicts:
samples/browseable/ActivityInstrumentation/_index.jd
samples/browseable/TextLinkify/_index.jd
Change-Id: Ia9a333bd09d2e7e9417a560581c40bd02d295c12
Diffstat (limited to 'samples/browseable/TextLinkify')
| -rw-r--r-- | samples/browseable/TextLinkify/_index.jd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/browseable/TextLinkify/_index.jd b/samples/browseable/TextLinkify/_index.jd index 9f3193099..36aa07515 100644 --- a/samples/browseable/TextLinkify/_index.jd +++ b/samples/browseable/TextLinkify/_index.jd @@ -8,7 +8,7 @@ sample.group=Views <p>This sample demonstrates how to add clickable links to a {@link android.widget.TextView}, by using these techniques: <ul> -<li>Setting the {@link android.R.styleable#TextView_autoLink} property +<li>Setting the {@link android.R.styleable#TextView_autoLink} property to automatically convert the text to a link.</li> <li>Parsing a String as HTML</li> <li>Manually by constructing a {@link android.text.SpannableString}.</li> |