Merge changes from topic "dnd_touch_sounds" into pi-dev am: e9fbcd7114

am: 57cda98f4c

Change-Id: I102fc43f6dc91f1bbeefdea822007475f0645768
This commit is contained in:
Beverly
2018-03-13 22:35:42 +00:00
committed by android-build-merger
3 changed files with 31 additions and 41 deletions

View File

@@ -6999,6 +6999,11 @@
<!-- Do not disturb: what to block summary, all effects -->
<string name="zen_mode_block_effect_summary_all">Sound, vibration, and visual signs of notifications</string>
<!-- Do not disturb: Zen mode no sounds are exceptions to bypass do not disturb-->
<string name="zen_mode_no_exceptions">None</string>
<!-- Do not disturb: Zen mode catch all "other" sounds can bypass do not disturb -->
<string name="zen_mode_other_options">other options</string>
<!-- Do not disturb: Button to add new automatic rule to DND. [CHAR LIMIT=30] -->
<string name="zen_mode_add">Add</string>
@@ -7592,8 +7597,8 @@
<!-- [CHAR LIMIT=50] Zen mode settings: Media option -->
<string name="zen_mode_media">Media</string>
<!-- [CHAR LIMIT=50] Zen mode settings: System option which includes sounds such as touch and charging sounds -->
<string name="zen_mode_system">Touch and charging sounds</string>
<!-- [CHAR LIMIT=50] Zen mode settings: System option which includes sounds such as touch sounds -->
<string name="zen_mode_system">Touch sounds</string>
<!-- [CHAR LIMIT=50] Zen mode settings: Reminders option -->
<string name="zen_mode_reminders">Reminders</string>