summaryrefslogtreecommitdiffstats
path: root/docs/html/guide
diff options
context:
space:
mode:
Diffstat (limited to 'docs/html/guide')
-rw-r--r--docs/html/guide/appendix/api-levels.jd2
-rw-r--r--docs/html/guide/samples/images/BluetoothChat1.pngbin16064 -> 0 bytes
-rw-r--r--docs/html/guide/samples/images/BluetoothChat2.pngbin15678 -> 0 bytes
-rw-r--r--docs/html/guide/samples/images/ContactManager1.pngbin13809 -> 0 bytes
-rw-r--r--docs/html/guide/samples/images/ContactManager2.pngbin11581 -> 0 bytes
-rw-r--r--docs/html/guide/samples/images/MultiResolution.pngbin96462 -> 0 bytes
-rw-r--r--docs/html/guide/samples/images/Wiktionary.pngbin23644 -> 0 bytes
-rw-r--r--docs/html/guide/samples/images/WiktionarySimple.pngbin61543 -> 0 bytes
-rw-r--r--docs/html/guide/samples/index.jd37
-rw-r--r--docs/html/guide/topics/intents/intents-filters.jd2
10 files changed, 21 insertions, 20 deletions
diff --git a/docs/html/guide/appendix/api-levels.jd b/docs/html/guide/appendix/api-levels.jd
index 2c255a99..272d027 100644
--- a/docs/html/guide/appendix/api-levels.jd
+++ b/docs/html/guide/appendix/api-levels.jd
@@ -6,7 +6,7 @@ page.title=Android API Levels
<h2>In this document</h2>
<ol>
- <li><a href="intro">What is API Level?</a></li>
+ <li><a href="#intro">What is API Level?</a></li>
<li><a href="#uses">Uses of API Level in Android</a></li>
<li><a href="#considerations">Development Considerations</a>
<ol>
diff --git a/docs/html/guide/samples/images/BluetoothChat1.png b/docs/html/guide/samples/images/BluetoothChat1.png
deleted file mode 100644
index f87da6a..0000000
--- a/docs/html/guide/samples/images/BluetoothChat1.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/guide/samples/images/BluetoothChat2.png b/docs/html/guide/samples/images/BluetoothChat2.png
deleted file mode 100644
index 6218eff..0000000
--- a/docs/html/guide/samples/images/BluetoothChat2.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/guide/samples/images/ContactManager1.png b/docs/html/guide/samples/images/ContactManager1.png
deleted file mode 100644
index 78f09d2..0000000
--- a/docs/html/guide/samples/images/ContactManager1.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/guide/samples/images/ContactManager2.png b/docs/html/guide/samples/images/ContactManager2.png
deleted file mode 100644
index 34da37d..0000000
--- a/docs/html/guide/samples/images/ContactManager2.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/guide/samples/images/MultiResolution.png b/docs/html/guide/samples/images/MultiResolution.png
deleted file mode 100644
index 8b245d9..0000000
--- a/docs/html/guide/samples/images/MultiResolution.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/guide/samples/images/Wiktionary.png b/docs/html/guide/samples/images/Wiktionary.png
deleted file mode 100644
index eae5da5..0000000
--- a/docs/html/guide/samples/images/Wiktionary.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/guide/samples/images/WiktionarySimple.png b/docs/html/guide/samples/images/WiktionarySimple.png
deleted file mode 100644
index a23226b..0000000
--- a/docs/html/guide/samples/images/WiktionarySimple.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/guide/samples/index.jd b/docs/html/guide/samples/index.jd
index 28f3d08..fc437e9 100644
--- a/docs/html/guide/samples/index.jd
+++ b/docs/html/guide/samples/index.jd
@@ -31,56 +31,57 @@ platforms) and allow you to view the source files in your browser. </p>
<div class="special">
<p>Some of the samples in this listing are not yet available in the
SDK. While we work to update the SDK, you can
- <a href="../../shareables/latest_samples.zip">download the latest samples</a> as a ZIP
- file here.</p>
+ <a href="{@docRoot}shareables/latest_samples.zip">download the latest samples</a> as a ZIP
+ archive.</p>
</div>
<dl>
- <dt><a href="ApiDemos/index.html">API Demos</a></dt>
+ <dt><a href="{@docRoot}resources/samples/ApiDemos/index.html">API Demos</a></dt>
<dd>A variety of small applications that demonstrate an extensive collection of
framework topics.</dd>
- <dt><a href="BluetoothChat/index.html">Bluetooth Chat</a></dt>
+ <dt><a href="{@docRoot}resources/samples/BluetoothChat/index.html">Bluetooth Chat</a></dt>
<dd>An application for two-way text messaging over Bluetooth.</dd>
- <dt><a href="ContactManager/index.html">Contact Manager</a></dt>
- <dd>An application that demonstrates how to query the system contacts provider, as
- well as insert contacts into a specific account.</p>
+ <dt><a href="{@docRoot}resources/samples/ContactManager/index.html">Contact Manager</a></dt>
+ <dd>An application that demonstrates how to query the system contacts provider
+ using the <code>ContactsContract</code> API, as
+ well as insert contacts into a specific account.</dd>
- <dt><a href="Home/index.html">Home</a></dt>
+ <dt><a href="{@docRoot}resources/samples/Home/index.html">Home</a></dt>
<dd>A home screen replacement application.</dd>
- <dt><a href="JetBoy/index.html">JetBoy</a></dt>
+ <dt><a href="{@docRoot}resources/samples/JetBoy/index.html">JetBoy</a></dt>
<dd>JetBoy is a game that demonstrates the SONiVOX JET interactive music technology,
with {@link android.media.JetPlayer}.</dd>
- <dt><a href="LunarLander/index.html">Lunar Lander</a></dt>
+ <dt><a href="{@docRoot}resources/samples/LunarLander/index.html">Lunar Lander</a></dt>
<dd>A classic Lunar Lander game.</dd>
- <dt><a href="MultiResolution/index.html">Multiple Resolutions</a></dt>
+ <dt><a href="{@docRoot}resources/samples/MultiResolution/index.html">Multiple Resolutions</a></dt>
<dd>A sample application that shows how to use resource directory qualifiers to
provide different resources for different screen configurations.</dd>
- <dt><a href="NotePad/index.html">Note Pad</a></dt>
+ <dt><a href="{@docRoot}resources/samples/NotePad/index.html">Note Pad</a></dt>
<dd>An application for saving notes. Similar (but not identical) to the
- <a href="{@docRoot}guide/tutorials/notepad/index.html">Notepad tutorial</a>.</dd>
+ <a href="{@docRoot}resources/tutorials/notepad/index.html">Notepad tutorial</a>.</dd>
- <dt><a href="SearchableDictionary/index.html">Searchable Dictionary</a></dt>
+ <dt><a href="{@docRoot}resources/samples/SearchableDictionary/index.html">Searchable Dictionary</a></dt>
<dd>A sample application that demonstrates Android's search framework,
including how to provide search suggestions for Quick Search Box.</dd>
- <dt><a href="Snake/index.html">Snake</a></dt>
+ <dt><a href="{@docRoot}resources/samples/Snake/index.html">Snake</a></dt>
<dd>An implementation of the classic game "Snake."</dd>
- <dt><a href="SoftKeyboard/index.html">Soft Keyboard</a></dt>
+ <dt><a href="{@docRoot}resources/samples/SoftKeyboard/index.html">Soft Keyboard</a></dt>
<dd>An example of writing an input method for a software keyboard.</dd>
- <dt><a href="Wiktionary/index.html">Wiktionary</a></dt>
+ <dt><a href={@docRoot}resources/samples/Wiktionary/index.html">Wiktionary</a></dt>
<dd>An example of creating interactive widgets for display on the Android
home screen.</dd>
- <dt><a href="WiktionarySimple/index.html">Wiktionary (Simplified)</a></dt>
+ <dt><a href="{@docRoot}resources/samples/WiktionarySimple/index.html">Wiktionary (Simplified)</a></dt>
<dd>A simple Android home screen widgets example.</dd>
</dl>
diff --git a/docs/html/guide/topics/intents/intents-filters.jd b/docs/html/guide/topics/intents/intents-filters.jd
index 7a7eb70..110721d 100644
--- a/docs/html/guide/topics/intents/intents-filters.jd
+++ b/docs/html/guide/topics/intents/intents-filters.jd
@@ -968,7 +968,7 @@ NoteEditor activity:
<dd>Asks the activity to display the content of the note identified
by {@code <var>ID</var>}. (For details on how {@code content:} URIs
specify individual members of a group, see
-<a href="{@docRoot}guide/topics/provider/content-providers.html">Content Providers</a>.)
+<a href="{@docRoot}guide/topics/providers/content-providers.html">Content Providers</a>.)
<dt>action: <code>android.intent.action.EDIT</code>
<br/>data: <code>content://com.google.provider.NotePad/notes/<var>ID</var></code></dt>