diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2009-09-11 09:45:11 -0700 |
|---|---|---|
| committer | Jaikumar Ganesh <jaikumar@google.com> | 2009-09-11 12:00:14 -0700 |
| commit | 5f23cb39a1bd9c319383108c209fca7f0256894b (patch) | |
| tree | 6c64af89eed3f798eb6b5b6b52d0dc101314d723 /AndroidManifest.xml | |
| parent | d6375e975e74924082cbf3f9b4c6f2a67b1ee08d (diff) | |
| download | packages_apps_settings-5f23cb39a1bd9c319383108c209fca7f0256894b.zip packages_apps_settings-5f23cb39a1bd9c319383108c209fca7f0256894b.tar.gz packages_apps_settings-5f23cb39a1bd9c319383108c209fca7f0256894b.tar.bz2 | |
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.
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 2 |
1 files changed, 1 insertions, 1 deletions
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> |