summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2009-12-09 18:11:16 -0800
committerandroid-build SharedAccount <android-build@sekiwake.mtv.corp.google.com>2009-12-16 15:06:04 -0800
commiteca3e85b455360d5941bfefe63c80a53f5af097a (patch)
tree2578510282931cadacea198e4a965c39dd999053
parentef337e70dd82fa68539ec44f977f17a849b4d11e (diff)
downloadbase-eca3e85b455360d5941bfefe63c80a53f5af097a.tar.gz
docs: add images used in BT developer guide.
needed (but not a dependency) by I1cd5c8282ba45d79da854db43d741b6fa049812b
-rw-r--r--docs/html/guide/topics/wireless/bluetooth.jd13
-rw-r--r--docs/html/images/bt_enable_discoverable.pngbin0 -> 12713 bytes
-rw-r--r--docs/html/images/bt_enable_request.pngbin0 -> 9574 bytes
-rw-r--r--docs/html/images/bt_pairing_request.pngbin0 -> 7878 bytes
4 files changed, 7 insertions, 6 deletions
diff --git a/docs/html/guide/topics/wireless/bluetooth.jd b/docs/html/guide/topics/wireless/bluetooth.jd
index 21881eb36da0..8a0efc9ac3d8 100644
--- a/docs/html/guide/topics/wireless/bluetooth.jd
+++ b/docs/html/guide/topics/wireless/bluetooth.jd
@@ -428,6 +428,11 @@ android.bluetooth.BluetoothSocket} in different ways. The server will receive it
when an incoming connection is accepted. The client will receive it when it
opens an RFCOMM channel to the server.</p>
+<div class="figure" style="width:200px">
+<img src="{@docRoot}images/bt_pairing_request.png" />
+<strong>Figure 3:</strong> The Bluetooth pairing dialog.
+</div>
+
<p>One implementation technique is to automatically prepare each device as a
server, so that each one has a server socket open and listening for connections.
Then either device can initiate a connection with the other and become the
@@ -435,14 +440,10 @@ client. Alternatively, one device can explicitly "host" the connection and open
a server socket on demand and the other device can simply initiate the
connection.</p>
-<div class="figure" style="width:200px">
-<img src="{@docRoot}images/bt_pairing_request.png" />
-<strong>Figure 3:</strong> The Bluetooth pairing dialog.
-</div>
-
<p class="note"><strong>Note:</strong> If the two devices have not been previously paired,
then the Android framework will automatically show a pairing request notification or
-dialog to the user during the connection procedure. So when attempting to connect devices,
+dialog to the user during the connection procedure, as shown in Figure 3. So
+when attempting to connect devices,
your application does not need to be concerned about whether or not the devices are
paired. Your RFCOMM connection attempt will block until the user has successfully paired,
or will fail if the user rejects pairing, or if pairing fails or times out. </p>
diff --git a/docs/html/images/bt_enable_discoverable.png b/docs/html/images/bt_enable_discoverable.png
new file mode 100644
index 000000000000..7caec94af839
--- /dev/null
+++ b/docs/html/images/bt_enable_discoverable.png
Binary files differ
diff --git a/docs/html/images/bt_enable_request.png b/docs/html/images/bt_enable_request.png
new file mode 100644
index 000000000000..6fb78310a66f
--- /dev/null
+++ b/docs/html/images/bt_enable_request.png
Binary files differ
diff --git a/docs/html/images/bt_pairing_request.png b/docs/html/images/bt_pairing_request.png
new file mode 100644
index 000000000000..32725945b00b
--- /dev/null
+++ b/docs/html/images/bt_pairing_request.png
Binary files differ