PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Reorganize notification Settings classes"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-12-02 13:54:05 +00:00
committed by Android (Google) Code Review
parent 79efb45f0f aceccce75c
commit 7e117fba33
201 changed files with 402 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/app_notification_settings.xml
View File

@@ -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" />

8
res/xml/channel_notification_settings.xml
View File

@@ -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"/>

4
res/xml/configure_notification_settings.xml
View File

@@ -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>

4
res/xml/sound_settings.xml
View File

@@ -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"

2
res/xml/special_access.xml
View File

@@ -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

4
res/xml/zen_mode_custom_rule_settings.xml
View File

@@ -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>

6
res/xml/zen_mode_restrict_notifications_settings.xml
View File

@@ -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" />

12
res/xml/zen_mode_settings.xml
View File

@@ -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

6
res/xml/zen_mode_sound_vibration_settings.xml
View File

@@ -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>