resolved conflicts for merge of 2397b75d to klp-ub-dev

Change-Id: I1807a041af543acb7eb93105712d7f4af4d67521
This commit is contained in:
Dirk Dougherty
2013-11-05 09:21:20 -08:00

View File

@@ -5,10 +5,10 @@ page.tags="TextLinkify"
sample.group=Views sample.group=Views
@jd:body @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: {@link android.widget.TextView}, by using these techniques:
<ul> <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> to automatically convert the text to a link.</li>
<li>Parsing a String as HTML</li> <li>Parsing a String as HTML</li>
<li>Manually by constructing a {@link android.text.SpannableString}.</li> <li>Manually by constructing a {@link android.text.SpannableString}.</li>