diff options
| author | Scott Main <smain@google.com> | 2010-10-15 18:23:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 18:23:34 -0700 |
| commit | 81df9841c64e417fe2adfab0e8d694af09e07c0d (patch) | |
| tree | e02b8ab105ca55afc5c26c6675294583a3f75d8c | |
| parent | b2bd470010279fe45e2848aa8cd0b3ad6f6ca800 (diff) | |
| parent | 2c1dab44834fb20deda9f380dae1bd7c1826b40b (diff) | |
| download | frameworks_base-81df9841c64e417fe2adfab0e8d694af09e07c0d.zip frameworks_base-81df9841c64e417fe2adfab0e8d694af09e07c0d.tar.gz frameworks_base-81df9841c64e417fe2adfab0e8d694af09e07c0d.tar.bz2 | |
am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo
Merge commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b' into gingerbread-plus-aosp
* commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b':
docs: fix typo; surface dev guide link in package description
| -rw-r--r-- | core/java/android/bluetooth/package.html | 11 | ||||
| -rw-r--r-- | docs/html/guide/topics/wireless/bluetooth.jd | 6 |
2 files changed, 9 insertions, 8 deletions
diff --git a/core/java/android/bluetooth/package.html b/core/java/android/bluetooth/package.html index 5ff240c..9ac42dc 100644 --- a/core/java/android/bluetooth/package.html +++ b/core/java/android/bluetooth/package.html @@ -1,7 +1,11 @@ <HTML> <BODY> -Provides classes that manage Bluetooth functionality, such as scanning for -devices, connecting with devices, and managing data transfer between devices. +<p>Provides classes that manage Bluetooth functionality, such as scanning for +devices, connecting with devices, and managing data transfer between devices.</p> + +<p>For a complete guide to using the Bluetooth APIs, see the <a +href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth</a> developer guide.</p> +{@more} <p>The Bluetooth APIs let applications:</p> <ul> @@ -20,9 +24,6 @@ also requires the {@link android.Manifest.permission#BLUETOOTH_ADMIN} permission. </p> -<p>For a detailed guide to using the Bluetooth APIs, see the <a -href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth Dev Guide topic</a>.</p> - <p class="note"><strong>Note:</strong> Not all Android devices are guaranteed to have Bluetooth functionality.</p> </BODY> diff --git a/docs/html/guide/topics/wireless/bluetooth.jd b/docs/html/guide/topics/wireless/bluetooth.jd index fa2875b..98b6e7d 100644 --- a/docs/html/guide/topics/wireless/bluetooth.jd +++ b/docs/html/guide/topics/wireless/bluetooth.jd @@ -9,7 +9,7 @@ page.title=Bluetooth <li>Android's bluetooth APIs allow your application to perform wireless data transactions with other devices</li> </ul> - + <h2>In this document</h2> <ol> <li><a href="#TheBasics">The Basics</a></li> @@ -32,7 +32,7 @@ other devices</li> </li> <li><a href="#ManagingAConnection">Managing a Connection</a></li> </ol> - + <h2>Key classes</h2> <ol> <li>{@link android.bluetooth.BluetoothAdapter}</li> @@ -289,7 +289,7 @@ is discussed below.</p> of paired devices to see if the desired device is already known. To do so, call {@link android.bluetooth.BluetoothAdapter#getBondedDevices()}. This will return a Set of {@link android.bluetooth.BluetoothDevice}s representing -paired devices. For example, you can query all paired devices and then add then +paired devices. For example, you can query all paired devices and then show the name of each device to the user, using an ArrayAdapter:</p> <pre> Set<BluetoothDevice> pairedDevices = mBluetoothAdapter.getBondedDevices(); |