diff options
| author | Michael Chan <mchan@android.com> | 2009-12-03 20:44:45 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-03 20:44:45 -0800 |
| commit | 2ffa95fd591424ae87337078ead9693b716a9873 (patch) | |
| tree | dc94d06dfc70f77bc904f88060c7ae06ec1f9b35 /AndroidManifest.xml | |
| parent | 87985ae6de00f4001f957d7a27004843872a7e2a (diff) | |
| parent | 0bd445b974292dc3910b6bb85dcee7e7c378968f (diff) | |
| download | packages_apps_settings-2ffa95fd591424ae87337078ead9693b716a9873.zip packages_apps_settings-2ffa95fd591424ae87337078ead9693b716a9873.tar.gz packages_apps_settings-2ffa95fd591424ae87337078ead9693b716a9873.tar.bz2 | |
am 0bd445b9: b/2296110 New Dialog which appears when phone is place on dock.
Merge commit '0bd445b974292dc3910b6bb85dcee7e7c378968f' into eclair-mr2
* commit '0bd445b974292dc3910b6bb85dcee7e7c378968f':
b/2296110 New Dialog which appears when phone is place on dock.
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 71440d4..98993f9 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -488,6 +488,22 @@ </intent-filter> </activity> + <receiver + android:name=".bluetooth.DockAudioStateChangeReceiver" + > + <intent-filter> + <action android:name="android.intent.action.DOCK_EVENT" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </receiver> + + <activity android:name=".bluetooth.DockSettingsActivity" + android:label="@string/bluetooth_dock_settings" + android:launchMode="singleTask" + android:excludeFromRecents="true" + android:theme="@*android:style/Theme.Dialog.Alert"> + </activity> + <activity android:name=".bluetooth.RequestPermissionActivity" android:label="@string/bluetooth_permission_request" android:excludeFromRecents="true" |