am 88ff62db: Merge change I06398298 into eclair
Merge commit '88ff62db35796a3e8ac9fc812030bfdbbf0e99b1' into eclair-mr2
* commit '88ff62db35796a3e8ac9fc812030bfdbbf0e99b1':
docs: add images used in BT developer guide.
diff --git a/docs/html/guide/topics/wireless/bluetooth.jd b/docs/html/guide/topics/wireless/bluetooth.jd
index 21881eb..8a0efc9 100644
--- a/docs/html/guide/topics/wireless/bluetooth.jd
+++ b/docs/html/guide/topics/wireless/bluetooth.jd
@@ -428,6 +428,11 @@
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 @@
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 0000000..7caec94
--- /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 0000000..6fb7831
--- /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 0000000..3272594
--- /dev/null
+++ b/docs/html/images/bt_pairing_request.png
Binary files differ
