LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
quddusc
2013-11-04 18:47:17 -08:00
parent 99acac3adb 3943cdc962
commit 4e4303c993
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/browseable/ActivityInstrumentation/_index.jd
View File

@@ -8,6 +8,6 @@ sample.group=Testing
<p>This sample demonstrates how to use an
{@link android.test.InstrumentationTestCase} to test the internal state of an
{@link android.app.Activity}.</p>
<p>To learn more about using Android's custom testing framework, see
<a href="{@docRoot}training/activity-testing/index.html">Testing Your
<p>To learn more about using Android's custom testing framework, see
<a href="{@docRoot}training/activity-testing/index.html">Testing Your
Android Activity</a>.</p>

4
samples/browseable/TextLinkify/_index.jd
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>