summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2011-04-05 14:21:36 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-05 14:21:36 -0700
commite4cafabbcc4b69479217d1a167926b79c37e5ded (patch)
treebfe889e47caebabc9cf6aba9d7730db048d42f04 /docs
parent030b38ffc21ef3962b31d5bac5170531293b6046 (diff)
parenta90eb8fec1c67177b614b945bcc4a4b14aaabaff (diff)
downloadframeworks_base-e4cafabbcc4b69479217d1a167926b79c37e5ded.zip
frameworks_base-e4cafabbcc4b69479217d1a167926b79c37e5ded.tar.gz
frameworks_base-e4cafabbcc4b69479217d1a167926b79c37e5ded.tar.bz2
am a90eb8fe: docs: fix the TOC in a few docs
* commit 'a90eb8fec1c67177b614b945bcc4a4b14aaabaff': docs: fix the TOC in a few docs
Diffstat (limited to 'docs')
-rw-r--r--docs/html/guide/topics/data/data-storage.jd25
-rw-r--r--docs/html/guide/topics/fundamentals/fragments.jd2
-rw-r--r--docs/html/guide/topics/nfc/index.jd45
-rw-r--r--docs/html/guide/topics/wireless/bluetooth.jd11
4 files changed, 40 insertions, 43 deletions
diff --git a/docs/html/guide/topics/data/data-storage.jd b/docs/html/guide/topics/data/data-storage.jd
index e20d1ed..d31afa5 100644
--- a/docs/html/guide/topics/data/data-storage.jd
+++ b/docs/html/guide/topics/data/data-storage.jd
@@ -16,9 +16,22 @@ page.title=Data Storage
<h2>In this document</h2>
<ol>
<li><a href="#pref">Using Shared Preferences</a></li>
- <li><a href="#filesInternal">Using the Internal Storage</a></li>
- <li><a href="#filesExternal">Using the External Storage</a></li>
- <li><a href="#db">Using Databases</a></li>
+ <li><a href="#filesInternal">Using the Internal Storage</a>
+ <ol>
+ <li><a href="#InternalCache">Saving cache files</a></li>
+ <li><a href="#InternalMethods">Other useful methods</a></li>
+ </ol></li>
+ <li><a href="#filesExternal">Using the External Storage</a>
+ <ol>
+ <li><a href="#MediaAvail">Checking media availability</a></li>
+ <li><a href="#AccessingExtFiles">Accessing files on external storage</a></li>
+ <li><a href="#SavingSharedFiles">Saving files that should be shared</a></li>
+ <li><a href="#ExternalCache">Saving cache files</a></li>
+ </ol></li>
+ <li><a href="#db">Using Databases</a>
+ <ol>
+ <li><a href="#dbDebugging">Database debugging</a></li>
+ </ol></li>
<li><a href="#netw">Using a Network Connection</a></li>
</ol>
@@ -238,7 +251,7 @@ save to the external storage. All applications can read and write files placed o
storage and the user can remove them.</p>
-<h3>Checking media availability</h3>
+<h3 id="MediaAvail">Checking media availability</h3>
<p>Before you do any work with the external storage, you should always call {@link
android.os.Environment#getExternalStorageState()} to check whether the media is available. The
@@ -271,7 +284,7 @@ entirely, has been removed badly, etc. You can use these to notify the user with
when your application needs to access the media.</p>
-<h3>Accessing files on external storage</h3>
+<h3 id="AccessingExtFiles">Accessing files on external storage</h3>
<p>If you're using API Level 8 or greater, use {@link
android.content.Context#getExternalFilesDir(String) getExternalFilesDir()} to open a {@link
@@ -310,7 +323,7 @@ files and including them in apps like Gallery or Music.</p>
</div>
-<h3>Saving files that should be shared</h3>
+<h3 id="SavingSharedFiles">Saving files that should be shared</h3>
<p>If you want to save files that are not specific to your application and that should <em>not</em>
be deleted when your application is uninstalled, save them to one of the public directories on the
diff --git a/docs/html/guide/topics/fundamentals/fragments.jd b/docs/html/guide/topics/fundamentals/fragments.jd
index f780960..3908a7c 100644
--- a/docs/html/guide/topics/fundamentals/fragments.jd
+++ b/docs/html/guide/topics/fundamentals/fragments.jd
@@ -515,7 +515,7 @@ ExampleFragment fragment = (ExampleFragment) getFragmentManager().findFragmentBy
</pre>
-<h4 id="EventCallbacks">Creating event callbacks to the activity</h4>
+<h3 id="EventCallbacks">Creating event callbacks to the activity</h3>
<p>In some cases, you might need a fragment to share events with the activity. A good way to do that
is to define a callback interface inside the fragment and require that the host activity implement
diff --git a/docs/html/guide/topics/nfc/index.jd b/docs/html/guide/topics/nfc/index.jd
index f907b70..b486d3b 100644
--- a/docs/html/guide/topics/nfc/index.jd
+++ b/docs/html/guide/topics/nfc/index.jd
@@ -1,35 +1,24 @@
page.title=Near Field Communication
@jd:body
- <div id="qv-wrapper">
- <div id="qv">
- <h2>Near Field Communication quickview</h2>
-
+<div id="qv-wrapper">
+<div id="qv">
+ <h2>In this document</h2>
+ <ol>
+ <li><a href="#api">API Overview</a></li>
+ <li><a href="#manifest">Declaring Android Manifest elements</a></li>
+ <li><a href="#dispatch">The Tag Dispatch System</a>
<ol>
- <li><a href="#api">API Overview</a></li>
-
- <li><a href="#manifest">Declaring Android Manifest Elements</a></li>
-
- <li>
- <a href="#dispatch">The Tag Dispatch System</a>
-
- <ol>
- <li><a href="#intent-dispatch">Using the intent dispatch system</a></li>
-
- <li><a href="#foreground-dispatch">Using the foreground dispatch system</a></li>
- </ol>
- </li>
-
- <li><a href="#ndef">NDEF Messages</a></li>
-
- <li><a href="#read">Reading an NFC Tag</a></li>
-
- <li><a href="#write">Writing to an NFC Tag</a></li>
-
- <li><a href="#p2p">Peer to Peer Data Exchange</a></li>
- </ol>
- </div>
- </div>
+ <li><a href="#intent-dispatch">Using the intent dispatch system</a></li>
+ <li><a href="#foreground-dispatch">Using the foreground dispatch system</a></li>
+ </ol></li>
+ <li><a href="#ndef">Working with Data on NFC Tags</a></li>
+ <li><a href="#read">Reading an NFC Tag</a></li>
+ <li><a href="#write">Writing to an NFC Tag</a></li>
+ <li><a href="#p2p">Peer-to-Peer Data Exchange</a></li>
+ </ol>
+</div>
+</div>
<p>Near Field Communication (NFC) is a set of short-range wireless technologies, typically
requiring a distance of 4cm or less. NFC operates at 13.56mhz, and at rates ranging from 106
diff --git a/docs/html/guide/topics/wireless/bluetooth.jd b/docs/html/guide/topics/wireless/bluetooth.jd
index ae078b9..48632ea 100644
--- a/docs/html/guide/topics/wireless/bluetooth.jd
+++ b/docs/html/guide/topics/wireless/bluetooth.jd
@@ -18,18 +18,13 @@ other devices</li>
<li><a href="#FindingDevices">Finding Devices</a>
<ol>
<li><a href="#QueryingPairedDevices">Querying paired devices</a></li>
- <li><a href="#DiscoveringDevices">Discovering devices</a>
- <ol><li><a href="#EnablingDiscoverability">Enabling
- discoverability</a></li></ol>
- </li>
- </ol>
- </li>
+ <li><a href="#DiscoveringDevices">Discovering devices</a></li>
+ </ol></li>
<li><a href="#ConnectingDevices">Connecting Devices</a>
<ol>
<li><a href="#ConnectingAsAServer">Connecting as a server</a></li>
<li><a href="#ConnectingAsAClient">Connecting as a client</a></li>
- </ol>
- </li>
+ </ol></li>
<li><a href="#ManagingAConnection">Managing a Connection</a></li>
</ol>