Reorganize notification Settings classes
The notification package was getting too big.
Test: make -j64 RunSettingsRoboTests
Fixes: 145224451
Change-Id: I25ba82f42f7a137d8adcce72dcf8089d0e018bdc
diff --git a/res/xml/app_notification_settings.xml b/res/xml/app_notification_settings.xml
index 7330f8d..d6122af 100644
--- a/res/xml/app_notification_settings.xml
+++ b/res/xml/app_notification_settings.xml
@@ -26,7 +26,7 @@
android:key="block"
android:layout="@layout/styled_switch_bar" />
- <com.android.settings.notification.NotificationFooterPreference
+ <com.android.settings.notification.app.NotificationFooterPreference
android:key="block_desc" />
<!-- Channels/Channel groups added here -->
@@ -76,11 +76,11 @@
</PreferenceCategory>
- <com.android.settings.notification.NotificationFooterPreference
+ <com.android.settings.notification.app.NotificationFooterPreference
android:key="desc"
android:order="5000" />
- <com.android.settings.notification.NotificationFooterPreference
+ <com.android.settings.notification.app.NotificationFooterPreference
android:key="deleted"
android:order="8000" />
diff --git a/res/xml/channel_notification_settings.xml b/res/xml/channel_notification_settings.xml
index 267281f..2ecbec4 100644
--- a/res/xml/channel_notification_settings.xml
+++ b/res/xml/channel_notification_settings.xml
@@ -38,7 +38,7 @@
android:summary="@string/allow_interruption_summary" />
<!-- Importance -->
- <com.android.settings.notification.ImportancePreference
+ <com.android.settings.notification.app.ImportancePreference
android:key="importance"
android:order="4"
android:title="@string/notification_importance_title"
@@ -64,7 +64,7 @@
settings:initialExpandedChildrenCount="0">
<!-- Default ringtone -->
- <com.android.settings.notification.NotificationSoundPreference
+ <com.android.settings.notification.app.NotificationSoundPreference
android:key="ringtone"
android:title="@string/notification_channel_sound_title"
android:dialogTitle="@string/notification_channel_sound_title"
@@ -121,11 +121,11 @@
settings:allowDividerAbove="true"/>
</PreferenceCategory>
- <com.android.settings.notification.NotificationFooterPreference
+ <com.android.settings.notification.app.NotificationFooterPreference
android:key="desc"
android:order="100"/>
- <com.android.settings.notification.NotificationFooterPreference
+ <com.android.settings.notification.app.NotificationFooterPreference
android:key="block_desc"
android:order="110"
settings:allowDividerAbove="false"/>
diff --git a/res/xml/configure_notification_settings.xml b/res/xml/configure_notification_settings.xml
index 76e1555..fdfde67 100644
--- a/res/xml/configure_notification_settings.xml
+++ b/res/xml/configure_notification_settings.xml
@@ -128,8 +128,8 @@
android:key="zen_mode_notifications"
android:title="@string/zen_mode_settings_title"
settings:useAdminDisabledSummary="true"
- android:fragment="com.android.settings.notification.ZenModeSettings"
- settings:controller="com.android.settings.notification.ZenModePreferenceController"
+ android:fragment="com.android.settings.notification.zen.ZenModeSettings"
+ settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"
settings:allowDividerAbove="false"/>
</PreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index d99cc00..d82a324 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -98,12 +98,12 @@
<com.android.settingslib.RestrictedPreference
android:key="zen_mode"
android:title="@string/zen_mode_settings_title"
- android:fragment="com.android.settings.notification.ZenModeSettings"
+ android:fragment="com.android.settings.notification.zen.ZenModeSettings"
android:order="-120"
settings:useAdminDisabledSummary="true"
settings:keywords="@string/keywords_sounds_and_notifications_interruptions"
settings:allowDividerAbove="true"
- settings:controller="com.android.settings.notification.ZenModePreferenceController"/>
+ settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"/>
<Preference
android:key="gesture_prevent_ringing_sound"
diff --git a/res/xml/special_access.xml b/res/xml/special_access.xml
index b0d962a..25422bf 100644
--- a/res/xml/special_access.xml
+++ b/res/xml/special_access.xml
@@ -52,7 +52,7 @@
<Preference
android:key="zen_access"
android:title="@string/manage_zen_access_title"
- android:fragment="com.android.settings.notification.ZenAccessSettings"
+ android:fragment="com.android.settings.notification.zen.ZenAccessSettings"
settings:controller="com.android.settings.applications.specialaccess.zenaccess.ZenAccessController" />
<Preference
diff --git a/res/xml/zen_mode_custom_rule_settings.xml b/res/xml/zen_mode_custom_rule_settings.xml
index 7aedd2c..169a94f 100644
--- a/res/xml/zen_mode_custom_rule_settings.xml
+++ b/res/xml/zen_mode_custom_rule_settings.xml
@@ -22,11 +22,11 @@
<PreferenceCategory
android:key="zen_custom_rule_category">
- <com.android.settings.notification.ZenCustomRadioButtonPreference
+ <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
android:key="zen_custom_rule_setting_default"
android:title="@string/zen_mode_custom_behavior_summary_default"/>
- <com.android.settings.notification.ZenCustomRadioButtonPreference
+ <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
android:key="zen_custom_rule_setting"
android:title="@string/zen_mode_custom_behavior_summary" />
</PreferenceCategory>
diff --git a/res/xml/zen_mode_restrict_notifications_settings.xml b/res/xml/zen_mode_restrict_notifications_settings.xml
index e024ab9..b0705cb 100644
--- a/res/xml/zen_mode_restrict_notifications_settings.xml
+++ b/res/xml/zen_mode_restrict_notifications_settings.xml
@@ -23,17 +23,17 @@
<PreferenceCategory
android:key="restrict_category"
android:title="@string/zen_mode_settings_category">
- <com.android.settings.notification.ZenCustomRadioButtonPreference
+ <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
android:key="zen_mute_notifications"
android:title="@string/zen_mode_restrict_notifications_mute"
android:summary="@string/zen_mode_restrict_notifications_mute_summary"/>
- <com.android.settings.notification.ZenCustomRadioButtonPreference
+ <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
android:key="zen_hide_notifications"
android:title="@string/zen_mode_restrict_notifications_hide"
android:summary="@string/zen_mode_restrict_notifications_hide_summary"/>
- <com.android.settings.notification.ZenCustomRadioButtonPreference
+ <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
android:key="zen_custom"
android:title="@string/zen_mode_restrict_notifications_custom" />
diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml
index 320a37c..b72c784 100644
--- a/res/xml/zen_mode_settings.xml
+++ b/res/xml/zen_mode_settings.xml
@@ -29,19 +29,19 @@
<Preference
android:key="zen_mode_behavior_calls"
android:title="@string/zen_mode_calls_title"
- android:fragment="com.android.settings.notification.ZenModeCallsSettings" />
+ android:fragment="com.android.settings.notification.zen.ZenModeCallsSettings" />
<!-- Messages -->
<Preference
android:key="zen_mode_behavior_messages"
android:title="@string/zen_mode_messages_title"
- android:fragment="com.android.settings.notification.ZenModeMessagesSettings" />
+ android:fragment="com.android.settings.notification.zen.ZenModeMessagesSettings" />
<!-- All sounds -->
<Preference
android:key="zen_sound_vibration_settings"
android:title="@string/zen_sound_title"
- android:fragment="com.android.settings.notification.ZenModeSoundVibrationSettings"
+ android:fragment="com.android.settings.notification.zen.ZenModeSoundVibrationSettings"
android:icon="@drawable/ic_chevron_right_24dp"/>
</PreferenceCategory>
@@ -49,11 +49,11 @@
<Preference
android:key="zen_mode_block_effects_settings"
android:title="@string/zen_mode_restrict_notifications_title"
- android:fragment="com.android.settings.notification.ZenModeRestrictNotificationsSettings"
+ android:fragment="com.android.settings.notification.zen.ZenModeRestrictNotificationsSettings"
settings:allowDividerAbove="true"/>
<!-- DND duration settings -->
- <com.android.settings.notification.ZenDurationDialogPreference
+ <com.android.settings.notification.zen.ZenDurationDialogPreference
android:key="zen_mode_duration_settings"
android:title="@string/zen_mode_duration_settings_title"
android:widgetLayout="@null"/>
@@ -62,7 +62,7 @@
<Preference
android:key="zen_mode_automation_settings"
android:title="@string/zen_mode_automation_settings_title"
- android:fragment="com.android.settings.notification.ZenModeAutomationSettings"/>
+ android:fragment="com.android.settings.notification.zen.ZenModeAutomationSettings"/>
<!-- Turn on DND button -->
<com.android.settingslib.widget.LayoutPreference
diff --git a/res/xml/zen_mode_sound_vibration_settings.xml b/res/xml/zen_mode_sound_vibration_settings.xml
index 73b5b05..b43bdcc 100644
--- a/res/xml/zen_mode_sound_vibration_settings.xml
+++ b/res/xml/zen_mode_sound_vibration_settings.xml
@@ -28,13 +28,13 @@
<Preference
android:key="zen_mode_calls_settings"
android:title="@string/zen_mode_calls"
- android:fragment="com.android.settings.notification.ZenModeCallsSettings" />
+ android:fragment="com.android.settings.notification.zen.ZenModeCallsSettings" />
<!-- Messages -->
<Preference
android:key="zen_mode_messages_settings"
android:title="@string/zen_mode_messages"
- android:fragment="com.android.settings.notification.ZenModeMessagesSettings" />
+ android:fragment="com.android.settings.notification.zen.ZenModeMessagesSettings" />
<!-- Alarms -->
<SwitchPreference
@@ -65,7 +65,7 @@
<Preference
android:key="zen_mode_bypassing_apps"
android:title="@string/zen_mode_bypassing_apps"
- android:fragment="com.android.settings.notification.ZenModeBypassingAppsSettings"/>
+ android:fragment="com.android.settings.notification.zen.ZenModeBypassingAppsSettings"/>
</PreferenceCategory>