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

Merge commit '3943cdc9' into manualmerge2

Browse Source 
Conflicts:
	samples/browseable/ActivityInstrumentation/_index.jd
	samples/browseable/TextLinkify/_index.jd

Change-Id: Ia9a333bd09d2e7e9417a560581c40bd02d295c12
This commit is contained in:
quddusc
2013-11-01 19:17:20 -07:00
parent f99585bddd 3943cdc962
commit 60737e9507
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,9 +5,9 @@ page.tags="ActivityInstrumentation"
sample.group=Testing
@jd:body
<p>This sample demonstrates how to use an
{@link android.test.InstrumentationTestCase} to test the internal state of an
<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>

2
samples/browseable/TextLinkify/_index.jd
View File

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