commit 5f23cb39a1bd9c319383108c209fca7f0256894b
author Jaikumar Ganesh <jaikumar@google.com> Fri Sep 11 09:45:11 2009 -0700
committer Jaikumar Ganesh <jaikumar@google.com> Fri Sep 11 12:00:14 2009 -0700
tree 6c64af89eed3f798eb6b5b6b52d0dc101314d723
parent d6375e975e74924082cbf3f9b4c6f2a67b1ee08d

Modify settings for 2.1

Add incoming pairing dialog
Add DisplayPasskey handling of pairing keyboards with 2.1 devices.
Modify code path to show errors when bonding request fails.
Misc fixes like string changes.

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7d85aa4..e61d375 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -444,7 +444,7 @@
                   android:label="@string/bluetooth_connect_specific_profiles_title" />
 
         <activity android:name=".bluetooth.BluetoothPairingDialog"
-                  android:label="@string/bluetooth_pin_entry"
+                  android:label="@string/bluetooth_pairing_dialog"
                   android:excludeFromRecents="true"
                   android:theme="@*android:style/Theme.Dialog.Alert">
             <intent-filter>