diff options
| author | Michael Chan <mchan@android.com> | 2009-09-28 17:39:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-28 17:39:14 -0700 |
| commit | 26917f1ddd052534c4a6e1577b79570d9bbbdd10 (patch) | |
| tree | 953355ed5c1c7d554fceb8a796d5d3a95575ab24 /AndroidManifest.xml | |
| parent | dcd813eac8678afaedc35f0271d79f1617cd810d (diff) | |
| parent | e1089ad33896f4fe5b75e773813367d700773b6f (diff) | |
| download | packages_apps_settings-26917f1ddd052534c4a6e1577b79570d9bbbdd10.zip packages_apps_settings-26917f1ddd052534c4a6e1577b79570d9bbbdd10.tar.gz packages_apps_settings-26917f1ddd052534c4a6e1577b79570d9bbbdd10.tar.bz2 | |
am e1089ad3: b/2142065 Added Bluetooth API to allow developer to request the user\'s permission to enable discovery mode.
Merge commit 'e1089ad33896f4fe5b75e773813367d700773b6f' into eclair-plus-aosp
* commit 'e1089ad33896f4fe5b75e773813367d700773b6f':
b/2142065 Added Bluetooth API to allow developer to request the user's permission to enable discovery mode.
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6c429a5..aa0f8f6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -487,6 +487,25 @@ </intent-filter> </activity> + <activity android:name=".bluetooth.RequestPermissionActivity" + android:label="@string/bluetooth_permission_request" + android:excludeFromRecents="true" + android:permission="android.permission.BLUETOOTH" + android:theme="@*android:style/Theme.Dialog.Alert"> + <intent-filter> + <action android:name="android.bluetooth.adapter.action.REQUEST_DISCOVERABLE" /> + <action android:name="android.bluetooth.adapter.action.REQUEST_ENABLE" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity> + + <activity android:name=".bluetooth.RequestPermissionHelperActivity" + android:label="@string/bluetooth_pairing_request" + android:excludeFromRecents="true" + android:permission="android.permission.BLUETOOTH" + android:theme="@*android:style/Theme.Dialog.Alert"> + </activity> + <receiver android:name=".bluetooth.BluetoothPairingRequest"> <intent-filter> <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" /> |