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.

1 files changed, 116 insertions, 0 deletions

diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
new file mode 100644
index 0000000..c8a8d97
--- /dev/null
+++ b/res/xml/sound_settings.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2008 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/sound_settings"
+        android:key="sound_settings"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+
+        <CheckBoxPreference
+                android:key="silent"
+                android:title="@string/silent_mode_title"
+                android:summary="@string/silent_mode_summary"
+                android:persistent="false"
+                android:order="1"
+                android:disableDependentsState="true" />
+
+        <com.android.settings.RingerVolumePreference
+                android:key="ring_volume"
+                android:title="@string/all_volume_title"
+                android:summary="@string/ring_volume_summary"
+                android:dialogTitle="@string/all_volume_title"
+                android:persistent="false"
+                android:dependency="silent"
+                android:order="2"
+                android:streamType="ring" />
+
+        <com.android.settings.DefaultRingtonePreference
+                android:key="ringtone"
+                android:title="@string/ringtone_title"
+                android:summary="@string/ringtone_summary"
+                android:dialogTitle="@string/ringtone_title"
+                android:persistent="false"
+                android:dependency="silent"
+                android:order="5"
+                android:ringtoneType="ringtone" />
+
+        <CheckBoxPreference
+                android:key="vibrate"
+                android:title="@string/vibrate_title"
+                android:summary="@string/vibrate_summary"
+                android:order="6"
+                android:persistent="false" />
+
+        <com.android.settings.DefaultRingtonePreference
+                android:key="notification_sound"
+                android:title="@string/notification_sound_title"
+                android:summary="@string/notification_sound_summary"
+                android:dialogTitle="@string/notification_sound_dialog_title"
+                android:dependency="silent"
+                android:persistent="false"
+                android:order="7"
+                android:ringtoneType="notification" />
+
+        <CheckBoxPreference
+                android:key="notification_pulse"
+                android:title="@string/notification_pulse_title"
+                android:summary="@string/notification_pulse_summary"
+                android:order="8"
+                android:persistent="false" />
+
+        <CheckBoxPreference
+                android:key="dtmf_tone"
+                android:title="@string/dtmf_tone_enable_title"
+                android:summaryOn="@string/dtmf_tone_enable_summary_on"
+                android:summaryOff="@string/dtmf_tone_enable_summary_off"
+                android:dependency="silent"
+                android:order="9"
+                android:defaultValue="true" />
+
+        <CheckBoxPreference
+                android:key="sound_effects"
+                android:title="@string/sound_effects_enable_title"
+                android:summaryOn="@string/sound_effects_enable_summary_on"
+                android:summaryOff="@string/sound_effects_enable_summary_off"
+                android:dependency="silent"
+                android:order="10"
+                android:defaultValue="true" />
+
+        <CheckBoxPreference
+                android:key="haptic_feedback"
+                android:title="@string/haptic_feedback_enable_title"
+                android:summaryOn="@string/haptic_feedback_enable_summary_on"
+                android:summaryOff="@string/haptic_feedback_enable_summary_off"
+                android:order="11"
+                android:defaultValue="true" />
+
+        <CheckBoxPreference
+                android:key="play_media_notification_sounds"
+                android:title="@string/play_media_notification_sounds_enable_title"
+                android:summaryOn="@string/play_media_notification_sounds_enable_summary_on"
+                android:summaryOff="@string/play_media_notification_sounds_enable_summary_off"
+                android:dependency="silent"
+                android:order="12"
+                android:defaultValue="true" />
+
+        <ListPreference
+                android:key="emergency_tone"
+                android:title="@string/emergency_tone_title"
+                android:summary="@string/emergency_tone_summary"
+                android:entries="@array/emergency_tone_entries"
+                android:entryValues="@array/emergency_tone_values" />
+
+</PreferenceScreen>