diff options
| author | Gilles Debunne <debunne@google.com> | 2011-06-20 15:00:07 -0700 |
|---|---|---|
| committer | Gilles Debunne <debunne@google.com> | 2011-06-21 11:05:29 -0700 |
| commit | e78c1879058571c00879f0d3e756951302adf513 (patch) | |
| tree | 9c5be08683179a2f2c6ee2a97f6c2d49880a5254 /AndroidManifest.xml | |
| parent | 222a619668df108c93b59087b1ff543bb123f7e0 (diff) | |
| download | packages_apps_Settings-e78c1879058571c00879f0d3e756951302adf513.tar.gz packages_apps_Settings-e78c1879058571c00879f0d3e756951302adf513.tar.bz2 packages_apps_Settings-e78c1879058571c00879f0d3e756951302adf513.zip | |
Settings refactoring
Wifi and bluetooth pane refactored, main toggles moved to left pane.
Change-Id: I42ea4cf3bdf24158f3c67e0dea311258206cd78a
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index aa32f74eb..bebc37a68 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -149,8 +149,8 @@ android:windowSoftInputMode="adjustResize" android:exported="true" /> - <activity-alias android:name=".wifi.AdvancedSettings" - android:label="@string/wifi_ip_settings_titlebar" + <activity-alias android:name=".wifi.AdvancedWifiSettings" + android:label="@string/wifi_advanced_settings_label" android:targetActivity="Settings" > <intent-filter> @@ -239,6 +239,18 @@ android:value="com.android.settings.Settings$WirelessSettingsActivity" /> </activity> + <activity-alias android:name=".bluetooth.AdvancedBluetoothSettings" + android:label="@string/bluetooth_advanced_settings_label" + android:targetActivity="Settings" + > + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <action android:name="android.settings.BLUETOOTH_ADVANCED_SETTINGS" /> + <category android:name="android.intent.category.VOICE_LAUNCH" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity-alias> + <activity android:name=".bluetooth.DevicePickerActivity" android:theme="@android:style/Theme.Holo.DialogWhenLarge" android:label="@string/device_picker" |