Refactor settings hierarchy and clump all volumes in one dialog.
Bug:2362077 Bug:2312836 Bug:2166486
Split Sound and Display into separate top-level settings.
All volume settings (including Alarm volume) now in one Volume dialog.
Remove some sub-texts to reduce clutter.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 0f6dae3..a89db90 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -249,16 +249,28 @@
</intent-filter>
</activity>
- <activity android:name="SoundAndDisplaySettings"
- android:label="@string/sound_and_display_settings_title"
+ <activity android:name="SoundSettings"
+ android:label="@string/sound_settings"
android:clearTaskOnLaunch="true"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="com.android.settings.SOUND_SETTINGS" />
+ <action android:name="android.settings.SOUND_SETTINGS" />
+ <category android:name="android.intent.category.DEFAULT" />
+ <category android:name="android.intent.category.VOICE_LAUNCH" />
+ <category android:name="com.android.settings.SHORTCUT" />
+ </intent-filter>
+ </activity>
+
+ <activity android:name="DisplaySettings"
+ android:label="@string/display_settings"
+ android:clearTaskOnLaunch="true"
+ >
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
<action android:name="com.android.settings.DISPLAY_SETTINGS" />
<action android:name="android.settings.DISPLAY_SETTINGS" />
- <action android:name="android.settings.SOUND_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.VOICE_LAUNCH" />
<category android:name="com.android.settings.SHORTCUT" />