Merge "Added zen settings messages and calls preferences."
This commit is contained in:
committed by
Android (Google) Code Review
commit
d76496dca1
@@ -1031,4 +1031,18 @@
|
||||
<item>never</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="zen_mode_contacts_entries" translatable="false">
|
||||
<item>@string/zen_mode_from_anyone</item>
|
||||
<item>@string/zen_mode_from_contacts</item>
|
||||
<item>@string/zen_mode_from_starred</item>
|
||||
<item>@string/zen_mode_from_none</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="zen_mode_contacts_values" translatable="false">
|
||||
<item>zen_mode_from_anyone</item>
|
||||
<item>zen_mode_from_contacts</item>
|
||||
<item>zen_mode_from_starred</item>
|
||||
<item>zen_mode_from_none</item>
|
||||
</string-array>
|
||||
|
||||
</resources>
|
||||
|
||||
@@ -6754,6 +6754,27 @@
|
||||
<!-- Do not disturb: Button to add new automatic rule to DND. [CHAR LIMIT=30] -->
|
||||
<string name="zen_mode_add">Add</string>
|
||||
|
||||
<!-- Do not disturb: Label for button that will turn on zen mode. [CHAR LIMIT=30] -->
|
||||
<string name="zen_mode_button_turn_on">TURN ON NOW</string>
|
||||
|
||||
<!-- Do not disturb: Label for button that will turn off zen mode. [CHAR LIMIT=30] -->
|
||||
<string name="zen_mode_button_turn_off">TURN OFF NOW</string>
|
||||
|
||||
<!-- [CHAR LIMIT=110] Zen mode settings footer: Footer showing end time of DND -->
|
||||
<string name="zen_mode_settings_dnd_manual_end_time_next_day">Do Not Disturb is on until <xliff:g id="formatted_time" example="7:00 AM">%s</xliff:g></string>
|
||||
|
||||
<!-- [CHAR LIMIT=110] Zen mode settings footer: Footer showing length of DND -->
|
||||
<string name="zen_mode_settings_dnd_manual_indefinite">Do Not Disturb will stay on until you turn it off.</string>
|
||||
|
||||
<!-- [CHAR LIMIT=110] Zen mode settings footer: Footer showing how DND was triggered by an automatic DND rule -->
|
||||
<string name="zen_mode_settings_dnd_automatic_rule">Do Not Disturb was automatically turned on by a rule <xliff:g id="rule_name" example="Weeknights">%s</xliff:g></string>
|
||||
|
||||
<!-- [CHAR LIMIT=110] Zen mode settings footer: Footer how DND was triggered by an app -->
|
||||
<string name="zen_mode_settings_dnd_automatic_rule_app">Do Not Disturb was automatically turned on by an app <xliff:g id="app_name" example="Pixel Services">%s</xliff:g></string>
|
||||
|
||||
<!-- [CHAR LIMIT=110] Zen mode settings footer: Footer how DND was triggered by multiple rules and/or apps -->
|
||||
<string name="zen_mode_settings_dnd_automatic_rule_multiple">Do Not Disturb was automatically turned on by a rule or app</string>
|
||||
|
||||
<!-- Work Sounds: Work sound settings section header. [CHAR LIMIT=50] -->
|
||||
<string name="sound_work_settings">Work profile sounds</string>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user