VolumeZen: Sound & Notifications settings.
- Add sound settings under the newly combined Sound & Notifications
top-level settings page.
- New slider preferences for setting audio stream volumes.
- Migrate checkbox prefs to switch prefs.
- New settings subpage for touch sounds.
- New settings subpage for "Showing notifications"
- New setting pref for displaying intercepted notifications in zen mode.
- New tri-state lockscreen notifications pref.
- Add priority + sensitivity options to app notification dialog.
- Remove badges on app notifications row, migrate to subtitle text.
- Migrate strings to common spot in strings.xml
- Remove heads up setting.
- Remove tweaks category (unused).
- Clean up notification settings, separate out into a code section per option.
- Clean up _settings.xml files, prefix each pref with option name.
- Add appropriate indexing data to each settings page.
Depends on f/b change Ic30aa575ae07650cee62c8c1d83b6bc69395cf0d
Change-Id: If700385a7d0057f6c4c4bcf6e648dcf88b8ebff2
diff --git a/res/xml/notification_settings.xml b/res/xml/notification_settings.xml
index 8cc1069..633c133 100644
--- a/res/xml/notification_settings.xml
+++ b/res/xml/notification_settings.xml
@@ -19,41 +19,78 @@
android:key="notification_settings"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+ <!-- Media volume -->
+ <com.android.settings.notification.VolumeSeekBarPreference
+ android:key="media_volume"
+ android:icon="@*android:drawable/ic_audio_vol"
+ android:title="@string/media_volume_option_title" />
+
+ <!-- Alarm volume -->
+ <com.android.settings.notification.VolumeSeekBarPreference
+ android:key="alarm_volume"
+ android:icon="@*android:drawable/ic_audio_alarm"
+ android:title="@string/alarm_volume_option_title" />
+
+ <!-- Ring volume -->
+ <com.android.settings.notification.VolumeSeekBarPreference
+ android:key="ring_volume"
+ android:icon="@*android:drawable/ic_audio_ring_notif"
+ android:title="@string/ring_volume_option_title" />
+
+ <!-- Do not disturb -->
+ <PreferenceScreen
+ android:key="zen_mode"
+ android:title="@string/zen_mode_settings_title"
+ android:fragment="com.android.settings.notification.ZenModeSettings" />
+
+ <!-- When calls and notifications arrive -->
+ <com.android.settings.notification.DropDownPreference
+ android:key="ringer_mode"
+ android:title="@string/ringer_mode_title"
+ android:persistent="false" />
+
+ <!-- Phone ringtone -->
<com.android.settings.DefaultRingtonePreference
- android:key="notification_sound"
- android:title="@string/default_sound"
- android:dialogTitle="@string/notification_sound_dialog_title"
+ android:key="ringtone"
+ android:title="@string/ringtone_title"
+ android:dialogTitle="@string/ringtone_title"
+ android:persistent="false"
+ android:ringtoneType="ringtone" />
+
+ <!-- Default notification ringtone -->
+ <com.android.settings.DefaultRingtonePreference
+ android:key="notification_ringtone"
+ android:title="@string/notification_ringtone_title"
+ android:dialogTitle="@string/notification_ringtone_title"
android:persistent="false"
android:ringtoneType="notification" />
- <CheckBoxPreference
- android:key="notification_pulse"
- android:title="@string/notification_pulse_title"
+ <!-- Vibrate when ringing -->
+ <SwitchPreference
+ android:key="vibrate_when_ringing"
+ android:title="@string/vibrate_when_ringing_title"
+ android:switchTextOff=""
+ android:switchTextOn=""
android:persistent="false" />
- <CheckBoxPreference
- android:key="heads_up"
- android:title="@string/heads_up_enabled_title"
- android:persistent="false" />
+ <!-- Showing notifications -->
+ <Preference
+ android:key="showing_notifications"
+ android:title="@string/notification_display_settings"
+ android:persistent="false"
+ android:fragment="com.android.settings.notification.NotificationDisplaySettings" />
- <com.android.settings.notification.DropDownPreference
- android:key="toggle_lock_screen_notifications"
- android:title="@string/lock_screen_notifications"
- android:persistent="false" />
+ <!-- Touch sounds -->
+ <Preference
+ android:key="touch_sounds"
+ android:title="@string/touch_sound_settings"
+ android:persistent="false"
+ android:fragment="com.android.settings.notification.TouchSoundSettings" />
- <PreferenceScreen
- android:key="configure"
- android:title="@string/notification_settings_apps_title"
- android:fragment="com.android.settings.notification.AppNotificationSettings" />
-
- <PreferenceScreen
- android:key="zen_mode"
- android:title="@string/title_zen_mode"
- android:fragment="com.android.settings.notification.ZenModeSettings" />
-
+ <!-- Notification access -->
<Preference
android:key="manage_notification_access"
- android:title="@string/manage_notification_access"
+ android:title="@string/manage_notification_access_title"
android:persistent="false"
android:fragment="com.android.settings.notification.NotificationAccessSettings" />