resolved conflicts for merge of 3943cdc9 to klp-ub-dev

This commit is contained in:
quddusc
2013-11-04 18:47:17 -08:00
2 changed files with 4 additions and 4 deletions

View File

@@ -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>