diff options
| author | Chris Wren <cwren@android.com> | 2012-09-24 14:23:46 -0400 |
|---|---|---|
| committer | Chris Wren <cwren@android.com> | 2012-09-24 15:57:10 -0400 |
| commit | 2bc32ae8088f6ae759668a0515b4fb418d99d967 (patch) | |
| tree | 6bc54010e099a04f7efdc328c69907e2f1dd262f /AndroidManifest.xml | |
| parent | 7fb91855b05b312e45bfded72d48e0cffcee4a44 (diff) | |
| download | packages_apps_settings-2bc32ae8088f6ae759668a0515b4fb418d99d967.zip packages_apps_settings-2bc32ae8088f6ae759668a0515b4fb418d99d967.tar.gz packages_apps_settings-2bc32ae8088f6ae759668a0515b4fb418d99d967.tar.bz2 | |
move remaining dock settings into sound settings fragment.
Bug: 7016769
Change-Id: I21a7bf6140f7470dbb9bebeda1ebcc3f17c481c6
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e95eec0..466e941 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -603,35 +603,6 @@ android:resource="@id/display_settings" /> </activity-alias> - <activity android:name="Settings$DockSettingsActivity" - android:label="@string/dock_settings_title" - android:enabled="@bool/has_dock_settings" - android:taskAffinity="com.android.settings" - android:parentActivityName="Settings"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <action android:name="com.android.settings.DOCK_SETTINGS" /> - <category android:name="android.intent.category.DEFAULT" /> - <category android:name="android.intent.category.VOICE_LAUNCH" /> - </intent-filter> - <meta-data android:name="com.android.settings.FRAGMENT_CLASS" - android:value="com.android.settings.DockSettings" /> - <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID" - android:resource="@id/dock_settings" /> - </activity> - - <!-- Keep compatibility with old shortcuts. --> - <activity-alias android:name="DockSettings" - android:label="@string/dock_settings_title" - android:enabled="@bool/has_dock_settings" - android:exported="true" - android:targetActivity="Settings$DockSettingsActivity"> - <meta-data android:name="com.android.settings.FRAGMENT_CLASS" - android:value="com.android.settings.DockSettings" /> - <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID" - android:resource="@id/dock_settings" /> - </activity-alias> - <activity android:name="Settings$DeviceInfoSettingsActivity" android:theme="@android:style/Theme.Holo.DialogWhenLarge" android:label="@string/device_info_settings" |