diff options
| author | quddusc <quddusc@google.com> | 2013-11-04 18:47:17 -0800 |
|---|---|---|
| committer | quddusc <quddusc@google.com> | 2013-11-04 18:47:17 -0800 |
| commit | 4e4303c993ef50d45e5d6b783d9c127b4d3857b1 (patch) | |
| tree | 0af7a83c782b13d1681a271a6da01e251e9cca0e /samples/browseable | |
| parent | 99acac3adb85aecf7dc42ae9242adfa8c8c6dfc0 (diff) | |
| parent | 3943cdc9626911fe2732fedd5c85e920c6078a9f (diff) | |
| download | android_development-4e4303c993ef50d45e5d6b783d9c127b4d3857b1.tar.gz android_development-4e4303c993ef50d45e5d6b783d9c127b4d3857b1.tar.bz2 android_development-4e4303c993ef50d45e5d6b783d9c127b4d3857b1.zip | |
resolved conflicts for merge of 3943cdc9 to klp-ub-dev
Diffstat (limited to 'samples/browseable')
| -rw-r--r-- | samples/browseable/ActivityInstrumentation/_index.jd | 4 | ||||
| -rw-r--r-- | samples/browseable/TextLinkify/_index.jd | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/samples/browseable/ActivityInstrumentation/_index.jd b/samples/browseable/ActivityInstrumentation/_index.jd index fa6272425..fcf341082 100644 --- a/samples/browseable/ActivityInstrumentation/_index.jd +++ b/samples/browseable/ActivityInstrumentation/_index.jd @@ -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> diff --git a/samples/browseable/TextLinkify/_index.jd b/samples/browseable/TextLinkify/_index.jd index 9f3193099..30499c54b 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> |