am bdeb3b9b: am 2d256206: Merge "Settings: Allow user to configure "None" for downtime." into lmp-mr1-dev automerge: 92f0246

* commit 'bdeb3b9beed36d4c62255961c358d23071e6687b':
  Settings: Allow user to configure "None" for downtime.
This commit is contained in:
John Spurlock
2014-11-05 20:53:38 +00:00
committed by Android Git Automerger
3 changed files with 43 additions and 2 deletions

View File

@@ -5830,7 +5830,7 @@
<string name="zen_mode_important_category">Priority interruptions</string>
<!-- [CHAR LIMIT=60] Zen mode settings: Downtime category text -->
<string name="zen_mode_downtime_category">Downtime (priority interruptions only)</string>
<string name="zen_mode_downtime_category">Downtime</string>
<!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option title -->
<string name="zen_mode_downtime_days">Days</string>
@@ -5838,6 +5838,15 @@
<!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, no days set -->
<string name="zen_mode_downtime_days_none">None</string>
<!-- [CHAR LIMIT=60] Zen mode settings: Downtime mode option title -->
<string name="zen_mode_downtime_mode_title">Interruptions allowed</string>
<!-- [CHAR LIMIT=40] Zen mode settings: Downtime mode option value, priority only -->
<string name="zen_mode_downtime_mode_priority">Priority only</string>
<!-- [CHAR LIMIT=40] Zen mode settings: Downtime mode option value, none -->
<string name="zen_mode_downtime_mode_none">None</string>
<!-- [CHAR LIMIT=40] Zen mode settings: Automation category text -->
<string name="zen_mode_automation_category">Automation</string>