summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2009-12-16 18:32:55 -0800
committerScott Main <smain@google.com>2009-12-16 18:48:02 -0800
commit1362bbcf760bd55d325d00ddea4b6f76afad8c08 (patch)
tree448d69be71bb4f5a6512d274a81eb0735bf790b2 /docs
parent7d67e1b36580d037a632c30f1eeca05ca951294b (diff)
downloadframeworks_base-1362bbcf760bd55d325d00ddea4b6f76afad8c08.zip
frameworks_base-1362bbcf760bd55d325d00ddea4b6f76afad8c08.tar.gz
frameworks_base-1362bbcf760bd55d325d00ddea4b6f76afad8c08.tar.bz2
docs: update the Bluetooth guide with links to the sample
app, scrub the sibling files, and revise the Bluetooth package summary to point to the BT dev guide.
Diffstat (limited to 'docs')
-rw-r--r--docs/html/guide/topics/wireless/bluetooth.jd11
-rw-r--r--docs/html/guide/topics/wireless/index.jd12
-rw-r--r--docs/html/guide/topics/wireless/wifi.jd2
3 files changed, 19 insertions, 6 deletions
diff --git a/docs/html/guide/topics/wireless/bluetooth.jd b/docs/html/guide/topics/wireless/bluetooth.jd
index 8a0efc9..80aa0d7 100644
--- a/docs/html/guide/topics/wireless/bluetooth.jd
+++ b/docs/html/guide/topics/wireless/bluetooth.jd
@@ -34,6 +34,12 @@ page.title=Bluetooth
<li><a href="#ManagingAConnection">Managing a Connection</a></li>
</ol>
+ <h2>See also</h2>
+ <ol>
+ <li><a href="{@docRoot}resources/samples/BluetoothChat/index.html">Bluetooth Chat sample
+ app</a></li>
+ </ol>
+
</div>
</div>
@@ -826,4 +832,7 @@ terminated at any time by closing the {@link android.bluetooth.BluetoothSocket}.
This should always be called when you're done using the Bluetooth
connection.</p>
-
+<div class="special">
+<p>For a complete demonstration using the Bluetooth APIs, see the <a
+href="{@docRoot}resources/samples/BluetoothChat/index.html">Bluetooth Chat sample app</a>.</p>
+</div>
diff --git a/docs/html/guide/topics/wireless/index.jd b/docs/html/guide/topics/wireless/index.jd
index a3a2b36..23d2f0f 100644
--- a/docs/html/guide/topics/wireless/index.jd
+++ b/docs/html/guide/topics/wireless/index.jd
@@ -1,8 +1,9 @@
page.title=Wireless Controls
@jd:body
+Go away.
-
+<!--
<h2>Wi-Fi</h2>
<p>The Wi-Fi APIs provide a means by which application can communicate with the lower-level
wireless stack that provides Wi-Fi network access. Almost all information from the device supplicant
@@ -12,8 +13,11 @@ interactions include the ability to scan, add, dave, terminate and initiate conn
<h2>Bluetooth</h2>
-<p>The Bluetooth APIs allow applications to scan, connect and pair with other Bluetooth devices.
-THESE APIS ARE NOT YET AVAILABLE.</p>
-
+<p>The Android platform includes support for the Bluetooth network stack, which allows a device to
+wirelessly exchange data with other Bluetooth devices. The application framework provides access to
+the Bluetooth functionality through the Android Bluetooth APIs. These APIs let applications
+wirelessly connect to other Bluetooth devices, enabling point-to-point and multipoint wireless
+features.</p>
+-->
diff --git a/docs/html/guide/topics/wireless/wifi.jd b/docs/html/guide/topics/wireless/wifi.jd
index 520feaf..761e463 100644
--- a/docs/html/guide/topics/wireless/wifi.jd
+++ b/docs/html/guide/topics/wireless/wifi.jd
@@ -15,4 +15,4 @@ parent.link=index.html
</div>
-TODO \ No newline at end of file
+Go away. \ No newline at end of file