Merge "Settings preference for choosing long-term conditions."

This commit is contained in:
John Spurlock
2014-05-01 19:17:59 +00:00
committed by Android (Google) Code Review
5 changed files with 239 additions and 19 deletions

View File

@@ -5182,8 +5182,17 @@
<!-- [CHAR LIMIT=40] Zen mode settings: Automatic category text -->
<string name="zen_mode_automatic_category">At night</string>
<!-- [CHAR LIMIT=40] Zen mode settings: Security category text -->
<string name="zen_mode_security_category">Security</string>
<!-- [CHAR LIMIT=40] Zen mode settings: Automation category text -->
<string name="zen_mode_automation_category">Other automation</string>
<!-- [CHAR LIMIT=40] Zen mode settings: Entry conditions option: title -->
<string name="zen_mode_entry_conditions_title">Automatically turn on</string>
<!-- [CHAR LIMIT=40] Zen mode settings: Entry conditions option: summary condition divider -->
<string name="zen_mode_entry_conditions_summary_divider">, </string>
<!-- [CHAR LIMIT=40] Zen mode settings: Entry conditions option: value when blank -->
<string name="zen_mode_entry_conditions_summary_none">Never</string>
<!-- [CHAR LIMIT=20] Zen mode settings: Phone calls option -->
<string name="zen_mode_phone_calls">Phone calls</string>