Merge "Create a new link preference for priority modes entry" into main

This commit is contained in:
Julia Reynolds
2024-07-09 13:17:06 +00:00
committed by Android (Google) Code Review
6 changed files with 269 additions and 15 deletions

View File

@@ -8114,6 +8114,14 @@
<!-- Do not disturb: mode page section title [CHAR LIMIT=80] -->
<string name="mode_device_effects_title">Additional actions</string>
<!-- Summary for the Sound Do not Disturb option when DND isn't currently on. [CHAR LIMIT=NONE]-->
<string name="modes_sound_summary_off">
{count, plural,
=0 {Off}
=1 {Off / 1 mode can turn on automatically}
other {Off / # modes can turn on automatically}
}
</string>
<!-- Do not disturb: display settings title [CHAR LIMIT=80] -->
<string name="mode_display_settings_title">Display settings</string>

View File

@@ -135,6 +135,15 @@
settings:controller="com.android.settings.notification.zen.ZenModePreferenceController"
/>
<com.android.settingslib.RestrictedPreference
android:key="modes_notifications"
android:order="18"
android:title="@string/zen_modes_list_title"
settings:useAdminDisabledSummary="true"
android:fragment="com.android.settings.notification.modes.ZenModesListFragment"
settings:controller="com.android.settings.notification.modes.ZenModesLinkPreferenceController"
/>
<SwitchPreferenceCompat
android:key="lock_screen_show_only_unseen_notifs"
android:order="19"