Updates main page for Do Not Disturb
Settings > Sound > Do Not Disturb - Update strings, more descriptive summary for DND Apps summary - Move top-level ordering of preferences - Remove old unused DND strings Test: make RunSettingsRoboTests7 Test: make ROBOTEST_FILTER=ZenModeBypassingAppsPreferenceControllerTest RunSettingsRoboTests Test: manual Bug: 151845457 Change-Id: I9c23c558a9d764702e966d22e5c6e5c5425e4d32
This commit is contained in:
@@ -39,7 +39,6 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="left"
|
||||
android:gravity="center"
|
||||
android:paddingTop="@dimen/zen_mode_button_padding_vertical"
|
||||
android:text="@string/zen_mode_button_turn_on"/>
|
||||
|
||||
<Button
|
||||
@@ -51,7 +50,6 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="left"
|
||||
android:gravity="center"
|
||||
android:paddingTop="@dimen/zen_mode_button_padding_vertical"
|
||||
android:text="@string/zen_mode_button_turn_off" />
|
||||
|
||||
</LinearLayout>
|
@@ -7747,13 +7747,13 @@
|
||||
<!-- Setting summary for controlling how caption text display in real time [CHAR LIMIT=NONE]-->
|
||||
<string name="live_caption_summary">Automatically caption media</string>
|
||||
|
||||
<!-- Sound: Summary for the Do not Disturb option when there is no automatic rules turned on. [CHAR LIMIT=NONE]-->
|
||||
<string name="zen_mode_settings_summary_off">Never</string>
|
||||
<!-- Sound: Summary for the Do not Disturb option when there are no automatic rules enabled. [CHAR LIMIT=NONE]-->
|
||||
<string name="zen_mode_settings_summary_off">None</string>
|
||||
|
||||
<!-- Sound: Summary for the Do not Disturb option when at least one automatic rules turned on. [CHAR LIMIT=NONE]-->
|
||||
<!-- Sound: Summary for the Do not Disturb option when at least one automatic rule is enabled. [CHAR LIMIT=NONE]-->
|
||||
<plurals name="zen_mode_settings_summary_on">
|
||||
<item quantity="one">1 enabled</item>
|
||||
<item quantity="other"><xliff:g id="on_count" example="10">%d</xliff:g> enabled</item>
|
||||
<item quantity="one">1 schedule set</item>
|
||||
<item quantity="other"><xliff:g id="on_count" example="10">%d</xliff:g> schedules set</item>
|
||||
</plurals>
|
||||
|
||||
<!-- Sound: Title for the Do not Disturb option and associated settings page. [CHAR LIMIT=50]-->
|
||||
@@ -7768,26 +7768,8 @@
|
||||
<!-- Do not disturb: Title for the Do not Disturb dialog to turn on Do not disturb. [CHAR LIMIT=50]-->
|
||||
<string name="zen_mode_settings_turn_on_dialog_title">Turn on Do Not Disturb</string>
|
||||
|
||||
<!-- Do not disturb: Title for the page describing what can bypass DND. [CHAR LIMIT=30] -->
|
||||
<string name="zen_mode_behavior_settings_title">Exceptions</string>
|
||||
|
||||
<!-- Do not disturb: Title for the dnd duration setting (user can specify how long dnd will last when toggling dnd on from qs or settings) [CHAR LIMIT=30] -->
|
||||
<string name="zen_mode_duration_settings_title">Default duration</string>
|
||||
|
||||
<!-- Do not disturb: Instructions indicating what types of sounds can bypass DND. [CHAR LIMIT=52] -->
|
||||
<string name="zen_mode_behavior_allow_title">Allow sounds and vibrations from</string>
|
||||
|
||||
<!-- Do not disturb: Subtitle for DND behavior indicating no sound will get past DND. [CHAR LIMIT=30] -->
|
||||
<string name="zen_mode_behavior_no_sound">No sound</string>
|
||||
|
||||
<!-- Do not disturb: Subtitle for DND behavior indicating no sound will get past DND. [CHAR LIMIT=40] -->
|
||||
<string name="zen_mode_behavior_total_silence">Total Silence</string>
|
||||
|
||||
<!-- Do not disturb: Used before specifying which sounds can bypass DND (ie: No sound except alarms and reminders). [CHAR LIMIT=40] -->
|
||||
<string name="zen_mode_behavior_no_sound_except">No sound except <xliff:g id="categories" example="alarms, media and system feedback">%1$s</xliff:g></string>
|
||||
|
||||
<!-- Do not disturb: Specifies alarms and media can bypass DND. [CHAR LIMIT=100] -->
|
||||
<string name="zen_mode_behavior_alarms_only">No sound except alarms and media</string>
|
||||
<string name="zen_mode_behavior_alarms_only">Alarms and media sounds can interrupt</string>
|
||||
|
||||
<!-- Do not disturb: Title for the zen mode automation option in Settings. [CHAR LIMIT=40] -->
|
||||
<string name="zen_mode_automation_settings_title">Schedules</string>
|
||||
@@ -7822,15 +7804,6 @@
|
||||
<!-- Do not disturb: Switch toggle to toggle whether to use an automatic dnd rule or not [CHAR LIMIT=40] -->
|
||||
<string name="zen_mode_use_automatic_rule">Use schedule</string>
|
||||
|
||||
<!-- Do not disturb: Zen mode option: Important interruptions [CHAR LIMIT=60] -->
|
||||
<string name="zen_mode_option_important_interruptions">Priority only</string>
|
||||
|
||||
<!-- Do not disturb: Zen mode option: Alarms only [CHAR LIMIT=60] -->
|
||||
<string name="zen_mode_option_alarms">Alarms only</string>
|
||||
|
||||
<!-- Do not disturb: Zen mode option: No interruptions [CHAR LIMIT=60] -->
|
||||
<string name="zen_mode_option_no_interruptions">Total silence</string>
|
||||
|
||||
<!-- Do not disturb: Zen mode combined summary + condition line [CHAR LIMIT=60] -->
|
||||
<string name="zen_mode_summary_combination"><xliff:g id="mode" example="Priority only">%1$s</xliff:g>: <xliff:g id="exit condition" example="Until you turn this off">%2$s</xliff:g></string>
|
||||
|
||||
@@ -7843,8 +7816,8 @@
|
||||
<!-- Do not disturb: zen settings screens category title [CHAR LIMIT=100] -->
|
||||
<string name="zen_mode_settings_category">Allow interruptions that make sound</string>
|
||||
|
||||
<!-- Do not disturb: restrict notifications title [CHAR LIMIT=80] -->
|
||||
<string name="zen_mode_restrict_notifications_title">Restrict notifications</string>
|
||||
<!-- Do not disturb: restrict notifications settings title [CHAR LIMIT=80] -->
|
||||
<string name="zen_mode_restrict_notifications_title">Display options for hidden notifications</string>
|
||||
<!-- Do not disturb: Mute notifications option [CHAR LIMIT=60] -->
|
||||
<string name="zen_mode_restrict_notifications_mute">No sound from notifications</string>
|
||||
<!-- Do not disturb:Mute notifications summary [CHAR LIMIT=NONE] -->
|
||||
@@ -7983,7 +7956,7 @@
|
||||
</plurals>
|
||||
|
||||
<!-- Do not disturb settings, main screen, category header [CHAR LIMIT=120]-->
|
||||
<string name="zen_category_behavior">Exceptions when Do Not Disturb is on</string>
|
||||
<string name="zen_category_behavior">What can interrupt Do Not Disturb</string>
|
||||
<!-- Do not disturb settings, main screen, field, dnd breakthrough [CHAR LIMIT=100]-->
|
||||
<string name="zen_category_people">People</string>
|
||||
<!-- Do not disturb settings, main screen, field, dnd breakthrough [CHAR LIMIT=100]-->
|
||||
@@ -7992,23 +7965,12 @@
|
||||
<string name="zen_category_exceptions">Alarms & other interruptions</string>
|
||||
<!-- Do not disturb settings, main screen, field, schedules [CHAR LIMIT=100]-->
|
||||
<string name="zen_category_schedule">Schedules</string>
|
||||
<!-- Do not disturb settings, main screen, field, dnd visuals [CHAR LIMIT=100]-->
|
||||
<string name="zen_category_visuals">Silenced notifications</string>
|
||||
<!-- Do not disturb settings, main screen, field, duration setting where user can specify how
|
||||
long dnd will last when toggling dnd on from qs or settings) [CHAR LIMIT=100] -->
|
||||
<string name="zen_category_duration">Set duration for Quick Settings</string>
|
||||
|
||||
<!-- Do not disturb settings, sound and vibrations screen footer [CHAR LIMIT=NONE]-->
|
||||
<string name="zen_sound_footer">When Do Not Disturb is on, sound and vibration will be muted, except for the items you allow above.</string>
|
||||
<!-- Do not disturb settings, sound and vibrations screen category [CHAR LIMIT=100]-->
|
||||
<string name="zen_sound_category_title">Mute all except</string>
|
||||
<!-- Do not disturb settings, sound and vibrations summary [CHAR LIMIT=100]-->
|
||||
<string name="zen_sound_all_muted">Muted</string>
|
||||
<!-- Do not disturb settings, sound and vibrations summary [CHAR LIMIT=100]-->
|
||||
<string name="zen_sound_none_muted">Not muted</string>
|
||||
<!-- Do not disturb settings, sound and vibrations summary [CHAR LIMIT=100]-->
|
||||
<string name="zen_sound_one_allowed">Muted, but allow <xliff:g id="sound_type" example="alarms">%1$s</xliff:g></string>
|
||||
<!-- Do not disturb settings, sound and vibrations summary [CHAR LIMIT=100]-->
|
||||
<string name="zen_sound_two_allowed">Muted, but allow <xliff:g id="sound_type" example="alarms">%1$s</xliff:g> and <xliff:g id="sound_type" example="media">%2$s</xliff:g></string>
|
||||
<!-- Do not disturb settings, sound and vibrations summary [CHAR LIMIT=100]-->
|
||||
<string name="zen_sound_three_allowed">Muted, but allow <xliff:g id="sound_type" example="alarms">%1$s</xliff:g>, <xliff:g id="sound_type" example="alarms">%2$s</xliff:g>, and <xliff:g id="sound_type" example="media">%3$s</xliff:g></string>
|
||||
|
||||
<!-- Do not disturb custom settings dialog title [CHAR LIMIT=40]-->
|
||||
<string name="zen_custom_settings_dialog_title">Custom settings</string>
|
||||
@@ -8913,19 +8875,15 @@
|
||||
|
||||
<!-- [CHAR LIMIT=20] Zen mode settings: Calls option -->
|
||||
<string name="zen_mode_calls">Allow calls</string>
|
||||
|
||||
<!-- [CHAR LIMIT=40] Zen mode settings: Allow calls toggle title -->
|
||||
<string name="zen_mode_calls_title">Calls</string>
|
||||
|
||||
<!-- [CHAR LIMIT=NONE] Zen mode settings: Calls screen footer -->
|
||||
<string name="zen_mode_calls_footer">To be sure allowed calls make sound, check whether your device is set to ring, vibrate, or silent.</string>
|
||||
|
||||
<!-- [CHAR LIMIT=NONE] Zen mode custom rule settings: Calls screen footer -->
|
||||
<string name="zen_mode_custom_calls_footer">For \u2018<xliff:g id="schedule_name" example="Schedule 1">%1$s</xliff:g>\u2019 incoming calls are blocked. You can adjust settings to allow your friends, family, or other contacts to reach you.</string>
|
||||
|
||||
<!-- [CHAR LIMIT=50] Zen mode settings: Starred contacts preference title -->
|
||||
<string name="zen_mode_starred_contacts_title">Starred contacts</string>
|
||||
|
||||
<!-- Zen mode settings: Starred contacts summary [CHAR LIMIT=NONE] -->
|
||||
<plurals name="zen_mode_starred_contacts_summary_additional_contacts">
|
||||
<item quantity="one">1 other</item>
|
||||
@@ -8939,128 +8897,119 @@
|
||||
|
||||
<!-- [CHAR LIMIT=40] Zen mode settings: Messages option -->
|
||||
<string name="zen_mode_messages">Allow messages</string>
|
||||
|
||||
<!-- Do not disturb settings, messages, events and reminders footer [CHAR LIMIT=NONE]-->
|
||||
<string name="zen_mode_messages_footer">To be sure allowed messages make sound, check whether your device is set to ring, vibrate, or silent.</string>
|
||||
|
||||
<!-- [CHAR LIMIT=NONE] Zen mode custom rule settings: Messages screen footer -->
|
||||
<string name="zen_mode_custom_messages_footer">For \u2018<xliff:g id="schedule_name" example="Schedule 1">%1$s</xliff:g>\u2019 incoming messages are blocked. You can adjust settings to allow your friends, family, or other contacts to reach you.</string>
|
||||
|
||||
<!-- [CHAR LIMIT=40] Zen mode settings: Allow messages to bypass DND title -->
|
||||
<string name="zen_mode_messages_title">SMS, MMS, and messaging apps</string>
|
||||
|
||||
<!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From anyone -->
|
||||
<string name="zen_mode_from_anyone">From anyone</string>
|
||||
|
||||
<!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From contacts only -->
|
||||
<string name="zen_mode_from_contacts">From contacts only</string>
|
||||
|
||||
<!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From starred contacts only -->
|
||||
<string name="zen_mode_from_starred">From starred contacts only</string>
|
||||
|
||||
<!-- Do not disturb settings, calls summary [CHAR LIMIT=100]-->
|
||||
<string name="zen_calls_summary_starred_repeat">From starred contacts and repeat callers</string>
|
||||
|
||||
<!-- Do not disturb settings, calls summary [CHAR LIMIT=100]-->
|
||||
<string name="zen_calls_summary_contacts_repeat">From contacts and repeat callers</string>
|
||||
|
||||
<!-- Do not disturb settings, calls summary [CHAR LIMIT=100]-->
|
||||
<string name="zen_calls_summary_repeat_only">From repeat callers only</string>
|
||||
|
||||
<!-- [CHAR LIMIT=40] Zen mode settings: Calls and/or messages from none-->
|
||||
<string name="zen_mode_from_none">None</string>
|
||||
|
||||
<!-- [CHAR LIMIT=40] Zen mode settings: Calls option value: No calls allowed -->
|
||||
<string name="zen_mode_from_none_calls">Don\u2019t allow any calls</string>
|
||||
|
||||
<!-- [CHAR LIMIT=40] Zen mode settings: Messages option value: No messages allowed -->
|
||||
<string name="zen_mode_from_none_messages">Don\u2019t allow any messages</string>
|
||||
|
||||
<!-- [CHAR LIMIT=80] Zen mode settings: Allow alarms option -->
|
||||
<string name="zen_mode_alarms">Alarms</string>
|
||||
|
||||
<!-- [CHAR LIMIT=NONE] Zen mode settings: Allow alarms summary -->
|
||||
<string name="zen_mode_alarms_summary">From timers, alarms, security systems, and other apps</string>
|
||||
|
||||
<!-- [CHAR LIMIT=50] Zen mode settings: Alarms option (ie: sound from alarm clock) -->
|
||||
<string name="zen_mode_alarms_list">alarms</string>
|
||||
|
||||
<!-- [CHAR LIMIT=80] Zen mode settings: Allow media (sound from video) to bypass dnd -->
|
||||
<string name="zen_mode_media">Media sounds</string>
|
||||
|
||||
<!-- [CHAR LIMIT=NONE] Zen mode settings: Allow media (sound from video) to bypass dnd summary-->
|
||||
<string name="zen_mode_media_summary">From videos, games, and other media</string>
|
||||
|
||||
<!-- [CHAR LIMIT=50] Zen mode settings: Media (ie: sound from video) -->
|
||||
<string name="zen_mode_media_list">media</string>
|
||||
|
||||
<!-- [CHAR LIMIT=80] Zen mode settings: allow touch sounds to bypass DND -->
|
||||
<string name="zen_mode_system">Touch sounds</string>
|
||||
|
||||
<!-- [CHAR LIMIT=NONE] Zen mode settings: allow touch sounds to bypass DND summary -->
|
||||
<string name="zen_mode_system_summary">From your keyboard and other buttons</string>
|
||||
|
||||
<!-- [CHAR LIMIT=50] Zen mode settings: System sounds (ie: touch sounds) -->
|
||||
<string name="zen_mode_system_list">touch sounds</string>
|
||||
|
||||
<!-- [CHAR LIMIT=80] Zen mode settings: Allow reminder notifications/sounds to bypass DND -->
|
||||
<string name="zen_mode_reminders">Reminders</string>
|
||||
|
||||
<!-- [CHAR LIMIT=NONE] Zen mode settings: Allow reminder notifications/sounds to bypass DND summary -->
|
||||
<string name="zen_mode_reminders_summary">From tasks and reminders</string>
|
||||
|
||||
<!-- [CHAR LIMIT=50] Zen mode settings: Reminders (ie: calendar reminders are allowed to bypass dnd) -->
|
||||
<string name="zen_mode_reminders_list">reminders</string>
|
||||
|
||||
<!-- [CHAR LIMIT=80] Zen mode settings: Allow event notifications/sounds to bypass DND -->
|
||||
<string name="zen_mode_events">Events</string>
|
||||
|
||||
<!-- [CHAR LIMIT=NONE] Zen mode settings: Allow event notifications/sounds to bypass DND summary -->
|
||||
<string name="zen_mode_events_summary">From upcoming calendar events</string>
|
||||
|
||||
<!-- [CHAR LIMIT=100] Zen mode settings: Allow apps to bypass DND -->
|
||||
<string name="zen_mode_bypassing_apps">Allow apps to override</string>
|
||||
|
||||
<!-- [CHAR LIMIT=100] Zen mode settings: Allow apps to bypass DND title-->
|
||||
<string name="zen_mode_bypassing_apps_title">App exceptions</string>
|
||||
|
||||
<!-- [CHAR LIMIT=120] Zen mode settings: No apps are bypassing DND -->
|
||||
<string name="zen_mode_bypassing_apps_subtext_none">No apps can override Do Not Disturb</string>
|
||||
|
||||
<!-- [CHAR LIMIT=120] Zen mode settings: Allow apps to bypass DND -->
|
||||
<plurals name="zen_mode_bypassing_apps_subtext">
|
||||
<item quantity="zero">No apps can override Do Not Disturb</item>
|
||||
<item quantity="one">Notifications from 1 app can override Do Not Disturb</item>
|
||||
<item quantity="other">Notifications from <xliff:g id="number" example="2">%1$d</xliff:g> apps can override Do Not Disturb</item>
|
||||
</plurals>
|
||||
|
||||
<!-- [CHAR LIMIT=50] Zen mode settings: Events (ie: calendar events) -->
|
||||
<string name="zen_mode_events_list">events</string>
|
||||
|
||||
<!-- [CHAR LIMIT=50] Zen mode settings: All callers summary -->
|
||||
<string name="zen_mode_all_callers">anyone</string>
|
||||
<!-- [CHAR LIMIT=100] Zen mode settings: Allow apps to bypass DND -->
|
||||
<string name="zen_mode_bypassing_apps">Allow apps to override</string>
|
||||
<!-- [CHAR LIMIT=120] Zen mode settings: No apps are bypassing DND -->
|
||||
<string name="zen_mode_bypassing_apps_subtext_none">No apps can interrupt</string>
|
||||
<!-- [CHAR LIMIT=120] Zen mode settings: Allow apps to bypass DND -->
|
||||
<plurals name="zen_mode_bypassing_apps_subtext">
|
||||
<item quantity="one"><xliff:g id="app_name" example="Nest">%s</xliff:g> can interrupt</item>
|
||||
<item quantity="other"><xliff:g id="app_names" example="Nest and Google Play Store">%s</xliff:g> can interrupt</item>
|
||||
</plurals>
|
||||
<!-- [CHAR LIMIT=30] Zen mode settings: List item in a summary indicating additional apps are
|
||||
allowed to bypass Do Not Disturb. For example, "Nest, Messages, and 2 more can interrupt". -->
|
||||
<string name="zen_mode_apps_bypassing_list_count"><xliff:g id="number" example="2">%d</xliff:g> more</string>
|
||||
<!-- [CHAR LIMIT=100] Zen mode settings: Allow apps to bypass DND title-->
|
||||
<string name="zen_mode_bypassing_apps_title">App exceptions</string>
|
||||
|
||||
<!-- [CHAR LIMIT=50] Zen mode settings: Selected callers summary -->
|
||||
<string name="zen_mode_contacts_callers">contacts</string>
|
||||
<!-- [CHAR LIMIT=120] Zen mode settings: Summary for sound interruption settings -->
|
||||
<plurals name="zen_mode_other_sounds_summary">
|
||||
<item quantity="one"><xliff:g id="sound_category">%s</xliff:g> can interrupt</item>
|
||||
<item quantity="other"><xliff:g id="sound_categories" example="Alarms, media sounds, and 2 more">%s</xliff:g> can interrupt</item>
|
||||
</plurals>
|
||||
<!-- [CHAR LIMIT=120] Zen mode settings: No other sounds are allowed to bypass DND -->
|
||||
<string name="zen_mode_other_sounds_none">Nothing can interrupt</string>
|
||||
<!-- [CHAR LIMIT=30] Zen mode settings: List item in a summary indicating additional sounds
|
||||
are allowed to bypass Do Not Disturb. For example, "Alarms, media sounds, and 2 more can
|
||||
interrupt". -->
|
||||
<string name="zen_mode_other_sounds_list_count"><xliff:g id="number" example="2">%d</xliff:g> more</string>
|
||||
|
||||
<!-- [CHAR LIMIT=50] Zen mode settings: Selected callers summary -->
|
||||
<string name="zen_mode_starred_callers">starred contacts</string>
|
||||
<!-- [CHAR LIMIT=120] Zen mode settings: Summary for people category -->
|
||||
<string name="zen_mode_people_none">No one can interrupt</string>
|
||||
<!-- [CHAR LIMIT=120] Zen mode settings: Summary for people category -->
|
||||
<string name="zen_mode_people_some">Some people can interrupt</string>
|
||||
<!-- [CHAR LIMIT=120] Zen mode settings: Summary for people category -->
|
||||
<string name="zen_mode_people_all">All people can interrupt</string>
|
||||
|
||||
<!-- [CHAR LIMIT=50] Zen mode settings: Repeat callers option -->
|
||||
<string name="zen_mode_repeat_callers">Repeat callers</string>
|
||||
|
||||
<!-- [CHAR LIMIT=50] Zen mode settings: Repeat callers (ie: repeat callers are allowed to bypass dnd) -->
|
||||
<string name="zen_mode_repeat_callers_list">repeat callers</string>
|
||||
|
||||
<!-- [CHAR LIMIT=70] Zen mode settings: Allow repeat callers toggle title -->
|
||||
<string name="zen_mode_repeat_callers_title">Allow repeat callers</string>
|
||||
|
||||
<!-- [CHAR LIMIT=50] Zen mode settings: All callers summary -->
|
||||
<string name="zen_mode_all_callers">anyone</string>
|
||||
<!-- [CHAR LIMIT=50] Zen mode settings: Selected callers summary -->
|
||||
<string name="zen_mode_contacts_callers">contacts</string>
|
||||
<!-- [CHAR LIMIT=50] Zen mode settings: Selected callers summary -->
|
||||
<string name="zen_mode_starred_callers">starred contacts</string>
|
||||
<!-- [CHAR LIMIT=50] Zen mode settings: Repeat callers (ie: repeat callers are allowed to bypass dnd) -->
|
||||
<string name="zen_mode_repeat_callers_list">repeat callers</string>
|
||||
<!-- [CHAR LIMIT=50] Zen mode settings: calls summary -->
|
||||
<string name="zen_mode_calls_summary_one">Allow from <xliff:g id="caller type" example="contacts">%1$s</xliff:g></string>
|
||||
|
||||
<!-- [CHAR LIMIT=50] Zen mode settings: calls summary -->
|
||||
<string name="zen_mode_calls_summary_two">Allow from <xliff:g id="caller type" example="starred contacts">%1$s</xliff:g> and <xliff:g id="callert tpye" example="repeat callers">%2$s</xliff:g></string>
|
||||
|
||||
<!-- [CHAR LIMIT=200] Zen mode settings: Repeat callers option summary -->
|
||||
<string name="zen_mode_repeat_callers_summary">If the same person calls a second time within a <xliff:g id="minutes">%d</xliff:g> minute period</string>
|
||||
|
||||
@@ -9069,43 +9018,33 @@
|
||||
|
||||
<!-- [CHAR LIMIT=20] Zen mode settings: When option -->
|
||||
<string name="zen_mode_when">Automatically turn on</string>
|
||||
|
||||
<!-- [CHAR LIMIT=20] Zen mode settings: When option value: Never -->
|
||||
<string name="zen_mode_when_never">Never</string>
|
||||
|
||||
<!-- [CHAR LIMIT=20] Zen mode settings: When option value: Every night -->
|
||||
<string name="zen_mode_when_every_night">Every night</string>
|
||||
|
||||
<!-- [CHAR LIMIT=20] Zen mode settings: When option value: Weeknights -->
|
||||
<string name="zen_mode_when_weeknights">Weeknights</string>
|
||||
|
||||
<!-- [CHAR LIMIT=20] Zen mode settings: Start time option -->
|
||||
<string name="zen_mode_start_time">Start time</string>
|
||||
|
||||
<!-- [CHAR LIMIT=20] Zen mode settings: End time option -->
|
||||
<string name="zen_mode_end_time">End time</string>
|
||||
|
||||
<!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when end time = next day -->
|
||||
<string name="zen_mode_end_time_next_day_summary_format"><xliff:g id="formatted_time" example="7:00 AM">%s</xliff:g> next day</string>
|
||||
|
||||
<!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only forever. -->
|
||||
<string name="zen_mode_summary_alarms_only_indefinite">Change to alarms only indefinitely</string>
|
||||
|
||||
<!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only for < 60 minutes. -->
|
||||
<plurals name="zen_mode_summary_alarms_only_by_minute">
|
||||
<item quantity="one">Change to alarms only for one minute until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
|
||||
<item quantity="other">Change to alarms only for <xliff:g id="duration" example="2">%1$d</xliff:g> minutes (until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
|
||||
</plurals>
|
||||
|
||||
<!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only for N hours. -->
|
||||
<plurals name="zen_mode_summary_alarms_only_by_hour">
|
||||
<item quantity="one">Change to alarms only for one hour until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
|
||||
<item quantity="other">Change to alarms only for <xliff:g id="duration" example="2">%1$d</xliff:g> hours until <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g></item>
|
||||
</plurals>
|
||||
|
||||
<!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only until a specific time. -->
|
||||
<string name="zen_mode_summary_alarms_only_by_time">Change to alarms only until <xliff:g id="formattedTime" example="10:00 PM">%1$s</xliff:g></string>
|
||||
|
||||
<!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: Turn on all notifications. -->
|
||||
<string name="zen_mode_summary_always">Change to always interrupt</string>
|
||||
|
||||
|
@@ -26,7 +26,6 @@
|
||||
android:title="@string/zen_mode_settings_title"
|
||||
android:selectable="false"
|
||||
android:layout="@layout/zen_mode_settings_button"
|
||||
settings:allowDividerAbove="true"
|
||||
settings:allowDividerBelow="true"
|
||||
settings:keywords="@string/keywords_zen_mode_settings"/>
|
||||
|
||||
@@ -55,26 +54,26 @@
|
||||
<!-- Automatic rules -->
|
||||
<Preference
|
||||
android:key="zen_mode_automation_settings"
|
||||
android:title="@string/zen_mode_automation_settings_title"
|
||||
android:title="@string/zen_category_schedule"
|
||||
settings:allowDividerAbove="true"
|
||||
settings:allowDividerBelow="true"
|
||||
android:fragment="com.android.settings.notification.zen.ZenModeAutomationSettings"/>
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="zen_mode_settings_advanced"
|
||||
settings:initialExpandedChildrenCount="1">
|
||||
settings:initialExpandedChildrenCount="0">
|
||||
|
||||
<!-- DND duration settings -->
|
||||
<com.android.settings.notification.zen.ZenDurationDialogPreference
|
||||
android:key="zen_mode_duration_settings"
|
||||
android:title="@string/zen_category_duration"
|
||||
android:widgetLayout="@null"/>
|
||||
|
||||
<!-- What to block (effects) -->
|
||||
<Preference
|
||||
android:key="zen_mode_block_effects_settings"
|
||||
android:title="@string/zen_mode_restrict_notifications_title"
|
||||
android:fragment="com.android.settings.notification.zen.ZenModeRestrictNotificationsSettings" />
|
||||
|
||||
<!-- DND duration settings -->
|
||||
<com.android.settings.notification.zen.ZenDurationDialogPreference
|
||||
android:key="zen_mode_duration_settings"
|
||||
android:title="@string/zen_mode_duration_settings_title"
|
||||
android:widgetLayout="@null"/>
|
||||
</PreferenceCategory>
|
||||
|
||||
<!-- Footer that shows if user is put into alarms only or total silence mode by an app -->
|
||||
|
Reference in New Issue
Block a user