diff options
author | John Spurlock <jspurlock@google.com> | 2015-04-10 08:11:12 -0400 |
---|---|---|
committer | John Spurlock <jspurlock@google.com> | 2015-04-10 08:12:14 -0400 |
commit | 35fba3eeafe47ccd900b3e18b6b64a16ad677462 (patch) | |
tree | 9e97d1ba2b6c81bf586ec8c816109baf591a73d2 /res | |
parent | d333a7d9f10500ec45377e099955031017d6a158 (diff) | |
download | packages_apps_Settings-35fba3eeafe47ccd900b3e18b6b64a16ad677462.zip packages_apps_Settings-35fba3eeafe47ccd900b3e18b6b64a16ad677462.tar.gz packages_apps_Settings-35fba3eeafe47ccd900b3e18b6b64a16ad677462.tar.bz2 |
Settings: New zen option to allow repeat callers.
Bug: 20064962
Change-Id: Icc65da146503386c057d7f78d6610f83f56d1a92
Diffstat (limited to 'res')
-rw-r--r-- | res/values/strings.xml | 9 | ||||
-rw-r--r-- | res/xml/zen_mode_priority_settings.xml | 8 |
2 files changed, 17 insertions, 0 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index 940f6bf..e300d42 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5915,6 +5915,15 @@ <!-- [CHAR LIMIT=50] Zen mode settings: Events option --> <string name="zen_mode_events">Events</string> + <!-- [CHAR LIMIT=50] Zen mode settings: Selected callers summary --> + <string name="zen_mode_selected_callers">Selected callers</string> + + <!-- [CHAR LIMIT=50] Zen mode settings: Repeat callers option --> + <string name="zen_mode_repeat_callers">Repeat callers</string> + + <!-- [CHAR LIMIT=200] Zen mode settings: Repeat callers option summary --> + <string name="zen_mode_repeat_callers_summary">If the same person calls a second time within a <xliff:g id="minutes">%d</xliff:g> minute period, allow it</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_priority_settings.xml b/res/xml/zen_mode_priority_settings.xml index 6cdbe95..5b1dbf8 100644 --- a/res/xml/zen_mode_priority_settings.xml +++ b/res/xml/zen_mode_priority_settings.xml @@ -67,4 +67,12 @@ android:title="@string/zen_mode_from" android:persistent="false" /> + <!-- Repeat callers --> + <SwitchPreference + android:key="repeat_callers" + android:title="@string/zen_mode_repeat_callers" + android:persistent="false" + android:switchTextOff="" + android:switchTextOn="" /> + </PreferenceScreen> |