diff options
| author | John Spurlock <jspurlock@google.com> | 2014-09-23 15:48:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-23 15:48:31 +0000 |
| commit | 2c383942b3fbda90e390cf8975fd3de32a0c007e (patch) | |
| tree | 136e5ca7e2b76fdf4ab03b9c7a5a2da4dac888a4 /res | |
| parent | 76fbe05a6e8acd36775fc7798dc4528ce0dc1fea (diff) | |
| parent | a7fb5fbc7b35ba905d84362582bdf67d53ad5d40 (diff) | |
| download | packages_apps_Settings-2c383942b3fbda90e390cf8975fd3de32a0c007e.zip packages_apps_Settings-2c383942b3fbda90e390cf8975fd3de32a0c007e.tar.gz packages_apps_Settings-2c383942b3fbda90e390cf8975fd3de32a0c007e.tar.bz2 | |
am a7fb5fbc: am 7d085d6d: am 65a7bc64: am 7e905488: Settings: Wire up new zen events config option.
* commit 'a7fb5fbc7b35ba905d84362582bdf67d53ad5d40':
Settings: Wire up new zen events config option.
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 11 | ||||
| -rw-r--r-- | res/xml/zen_mode_settings.xml | 7 |
2 files changed, 14 insertions, 4 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index e7a124e..139bacc 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -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> diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml index aea4291..8761d10 100644 --- a/res/xml/zen_mode_settings.xml +++ b/res/xml/zen_mode_settings.xml @@ -30,6 +30,13 @@ android:title="@string/zen_mode_important_category" > <SwitchPreference + android:key="events" + android:title="@string/zen_mode_events" + android:persistent="false" + android:switchTextOff="" + android:switchTextOn="" /> + + <SwitchPreference android:key="phone_calls" android:title="@string/zen_mode_phone_calls" android:persistent="false" |