Merge "Add zen-mode exit condition dialog to settings."

This commit is contained in:
John Spurlock
2014-04-29 00:09:52 +00:00
committed by Android (Google) Code Review
3 changed files with 181 additions and 1 deletions

View File

@@ -5156,6 +5156,9 @@
<!-- [CHAR LIMIT=20] Zen mode settings: Master switch option title, on -->
<string name="zen_mode_option_on">On</string>
<!-- [CHAR LIMIT=30] Zen mode settings: Exit condition selection dialog, default option -->
<string name="zen_mode_default_option">Until you turn this off</string>
<!-- [CHAR LIMIT=40] Zen mode settings: General category text -->
<string name="zen_mode_general_category">Block all interruptions except</string>