diff options
| author | Michael Chan <mchan@android.com> | 2009-12-07 20:50:54 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-07 20:50:54 -0800 |
| commit | 4e1e2d2bf674e5edf5a09e6788690851ae9a53f3 (patch) | |
| tree | f9518d40da8ebd6da6f25de644cca6125f30f327 /AndroidManifest.xml | |
| parent | b659c9e4102304b9c41558a2b8eaccc03c96a9e2 (diff) | |
| parent | 0c75b2d2dc35b88d5cb9db96afc72ed074ca5350 (diff) | |
| download | packages_apps_Settings-4e1e2d2bf674e5edf5a09e6788690851ae9a53f3.tar.gz packages_apps_Settings-4e1e2d2bf674e5edf5a09e6788690851ae9a53f3.tar.bz2 packages_apps_Settings-4e1e2d2bf674e5edf5a09e6788690851ae9a53f3.zip | |
am 0c75b2d2: Merge change I80790bdb into eclair
Merge commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350' into eclair-plus-aosp
* commit '0c75b2d2dc35b88d5cb9db96afc72ed074ca5350':
b/2296110 Dialog for setting up dock audio.
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8ee872811..b0bb7272b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -489,20 +489,14 @@ </activity> <receiver - android:name=".bluetooth.DockAudioStateChangeReceiver" - > + android:name=".bluetooth.DockEventReceiver"> <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> + <service android:name=".bluetooth.DockService" /> <activity android:name=".bluetooth.RequestPermissionActivity" android:label="@string/bluetooth_permission_request" |