Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "docs: fix typo; surface dev guide link in package description" into froyo

Browse Source
This commit is contained in:
Scott Main
2010-10-15 10:46:33 -07:00
committed by Android (Google) Code Review
parent 09da960999 36cdecd89d
commit fda5b19c75
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/bluetooth/package.html
View File

@@ -1,7 +1,11 @@
<HTML> <HTML>
<BODY> <BODY>
Provides classes that manage Bluetooth functionality, such as scanning for <p>Provides classes that manage Bluetooth functionality, such as scanning for
devices, connecting with devices, and managing data transfer between devices. 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> <p>The Bluetooth APIs let applications:</p>
<ul> <ul>
@@ -20,9 +24,6 @@ also requires the {@link android.Manifest.permission#BLUETOOTH_ADMIN}
permission. permission.
</p> </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> <p class="note"><strong>Note:</strong>
Not all Android devices are guaranteed to have Bluetooth functionality.</p> Not all Android devices are guaranteed to have Bluetooth functionality.</p>
</BODY> </BODY>

6
docs/html/guide/topics/wireless/bluetooth.jd
View File

@@ -9,7 +9,7 @@ page.title=Bluetooth
<li>Android's bluetooth APIs allow your application to perform wireless data transactions with <li>Android's bluetooth APIs allow your application to perform wireless data transactions with
other devices</li> other devices</li>
</ul> </ul>
<h2>In this document</h2> <h2>In this document</h2>
<ol> <ol>
<li><a href="#TheBasics">The Basics</a></li> <li><a href="#TheBasics">The Basics</a></li>
@@ -32,7 +32,7 @@ other devices</li>
</li> </li>
<li><a href="#ManagingAConnection">Managing a Connection</a></li> <li><a href="#ManagingAConnection">Managing a Connection</a></li>
</ol> </ol>
<h2>Key classes</h2> <h2>Key classes</h2>
<ol> <ol>
<li>{@link android.bluetooth.BluetoothAdapter}</li> <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, of paired devices to see if the desired device is already known. To do so,
call {@link android.bluetooth.BluetoothAdapter#getBondedDevices()}. This call {@link android.bluetooth.BluetoothAdapter#getBondedDevices()}. This
will return a Set of {@link android.bluetooth.BluetoothDevice}s representing 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> show the name of each device to the user, using an ArrayAdapter:</p>
<pre> <pre>
Set&lt;BluetoothDevice> pairedDevices = mBluetoothAdapter.getBondedDevices(); Set&lt;BluetoothDevice> pairedDevices = mBluetoothAdapter.getBondedDevices();