diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2013-11-05 09:21:20 -0800 |
|---|---|---|
| committer | Dirk Dougherty <ddougherty@google.com> | 2013-11-05 09:21:20 -0800 |
| commit | d7f2d1ca07b92cf333955f19e839f0b3dc30f9ff (patch) | |
| tree | 021c722ec4075ab78e73cdc6b374559e409cc724 /samples/browseable | |
| parent | a2a5de35c38613e60d0df784c9dcd7f08e6e463e (diff) | |
| parent | 2397b75dc47ef2beaa64def2fe7f1c0cb5bba62d (diff) | |
| download | android_development-d7f2d1ca07b92cf333955f19e839f0b3dc30f9ff.tar.gz android_development-d7f2d1ca07b92cf333955f19e839f0b3dc30f9ff.tar.bz2 android_development-d7f2d1ca07b92cf333955f19e839f0b3dc30f9ff.zip | |
resolved conflicts for merge of 2397b75d to klp-ub-dev
Change-Id: I1807a041af543acb7eb93105712d7f4af4d67521
Diffstat (limited to 'samples/browseable')
| -rw-r--r-- | samples/browseable/TextLinkify/_index.jd | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/samples/browseable/TextLinkify/_index.jd b/samples/browseable/TextLinkify/_index.jd index 30499c54b..9f3193099 100644 --- a/samples/browseable/TextLinkify/_index.jd +++ b/samples/browseable/TextLinkify/_index.jd @@ -5,10 +5,10 @@ page.tags="TextLinkify" sample.group=Views @jd:body -<p>This sample demonstrates how to add clickable links to a +<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> |