PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2c383942: am a7fb5fbc: am 7d085d6d: am 65a7bc64: am 7e905488: Settings: Wire up new zen events config option.

Browse Source 
* commit '2c383942b3fbda90e390cf8975fd3de32a0c007e':
  Settings: Wire up new zen events config option.
This commit is contained in:
John Spurlock
2014-09-23 19:06:42 +00:00
committed by Android Git Automerger
parent b30e33ceba 2c383942b3
commit edb8125abf
3 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
res/values/strings.xml
View File

@@ -5823,13 +5823,13 @@
<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>
<string name="zen_mode_phone_calls">Calls</string>
<!-- [CHAR LIMIT=20] Zen mode settings: Messages option -->
<string name="zen_mode_messages">Messages</string>
<!-- [CHAR LIMIT=20] Zen mode settings: From option -->
<string name="zen_mode_from">From</string>
<!-- [CHAR LIMIT=50] Zen mode settings: From option -->
<string name="zen_mode_from">Calls/messages from</string>
<!-- [CHAR LIMIT=30] Zen mode settings: From option value: Anyone -->
<string name="zen_mode_from_anyone">Anyone</string>
@@ -5840,8 +5840,11 @@
<!-- [CHAR LIMIT=30] Zen mode settings: From option value: Starred contacts -->
<string name="zen_mode_from_starred">Starred contacts only</string>
<!-- [CHAR LIMIT=50] Zen mode settings: Events option -->
<string name="zen_mode_events">Events and reminders</string>
<!-- [CHAR LIMIT=80] Zen mode settings: Reminder text about alarms -->
<string name="zen_mode_alarm_info">Alarms and other personal reminders are always priority</string>
<string name="zen_mode_alarm_info">Alarms are always priority interruptions</string>
<!-- [CHAR LIMIT=20] Zen mode settings: When option -->
<string name="zen_mode_when">Automatically turn on</string>