diff options
| author | Nick Pelly <npelly@google.com> | 2009-09-11 12:01:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-11 12:01:07 -0700 |
| commit | f9dce06d5ee028335ff445335303464ebb403901 (patch) | |
| tree | 8c8df6ce26b479c96b0f831634d5b51e302a0f5d /AndroidManifest.xml | |
| parent | e8b40cb857bfaab26f64d688d98b592cca70b089 (diff) | |
| parent | d6375e975e74924082cbf3f9b4c6f2a67b1ee08d (diff) | |
| download | packages_apps_settings-f9dce06d5ee028335ff445335303464ebb403901.zip packages_apps_settings-f9dce06d5ee028335ff445335303464ebb403901.tar.gz packages_apps_settings-f9dce06d5ee028335ff445335303464ebb403901.tar.bz2 | |
am d6375e97: Merge change 24726 into eclair
Merge commit 'd6375e975e74924082cbf3f9b4c6f2a67b1ee08d' into eclair-plus-aosp
* commit 'd6375e975e74924082cbf3f9b4c6f2a67b1ee08d':
Update AndroidManifest.xml for new Intent locations.
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9b77c78..4a5b258 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -126,7 +126,7 @@ <category android:name="android.intent.category.DEFAULT" /> </intent-filter> <intent-filter> - <action android:name="android.bluetooth.intent.action.DEVICE_PICKER" /> + <action android:name="android.bluetooth.devicepicker.action.LAUNCH" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> </activity> @@ -448,15 +448,15 @@ android:excludeFromRecents="true" android:theme="@*android:style/Theme.Dialog.Alert"> <intent-filter> - <action android:name="android.bluetooth.intent.action.PAIRING_REQUEST" /> + <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> </activity> <receiver android:name=".bluetooth.BluetoothPairingRequest"> <intent-filter> - <action android:name="android.bluetooth.intent.action.PAIRING_REQUEST" /> - <action android:name="android.bluetooth.intent.action.PAIRING_CANCEL" /> + <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" /> + <action android:name="android.bluetooth.device.action.PAIRING_CANCEL" /> </intent-filter> </receiver> @@ -610,7 +610,7 @@ <action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> <action android:name="android.net.wifi.WIFI_STATE_CHANGED" /> <action android:name="android.net.conn.BACKGROUND_DATA_SETTING_CHANGED" /> - <action android:name="android.bluetooth.intent.action.BLUETOOTH_STATE_CHANGED" /> + <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" /> <action android:name="android.intent.action.CLOSE_SYSTEM_DIALOGS" /> <!-- pick up misc changes --> </intent-filter> <meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" /> |