diff options
| author | John Spurlock <jspurlock@google.com> | 2014-10-20 14:22:38 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2014-10-20 14:22:38 -0400 |
| commit | 9a940cbf047e65e210f302b18cc95f45e63a1b13 (patch) | |
| tree | 90bdfb71c3aae93d6c3ed9539196de94b00ea9b8 /res | |
| parent | 1768f1aa6398ef2261f85df3b5581568844f39bc (diff) | |
| download | packages_apps_Settings-9a940cbf047e65e210f302b18cc95f45e63a1b13.zip packages_apps_Settings-9a940cbf047e65e210f302b18cc95f45e63a1b13.tar.gz packages_apps_Settings-9a940cbf047e65e210f302b18cc95f45e63a1b13.tar.bz2 | |
Settings: Display 'Calls' category on non-voice devices.
Since the category applies to any call, include config for
this interruption even on non-voice-capable devices.
Bug: 17666139
Change-Id: I3732246179c527220f8c6bee539ba7bc1e80de18
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 7 | ||||
| -rw-r--r-- | res/xml/zen_mode_settings.xml | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index e188645..6e16be2 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5631,9 +5631,6 @@ <!-- Sound & notification > Sound section: Title for the zen mode option. [CHAR LIMIT=60] --> <string name="zen_mode_option_title">When calls and notifications arrive</string> - <!-- Sound & notification > Sound section: Title for the zen mode option for devices without voice. [CHAR LIMIT=60] --> - <string name="zen_mode_option_title_novoice">When notifications arrive</string> - <!-- Sound & notification > Sound section: Zen mode option: Off [CHAR LIMIT=60] --> <string name="zen_mode_option_off">Always interrupt</string> @@ -5832,8 +5829,8 @@ <!-- [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">Calls</string> + <!-- [CHAR LIMIT=20] Zen mode settings: Calls option --> + <string name="zen_mode_calls">Calls</string> <!-- [CHAR LIMIT=20] Zen mode settings: Messages option --> <string name="zen_mode_messages">Messages</string> diff --git a/res/xml/zen_mode_settings.xml b/res/xml/zen_mode_settings.xml index 8761d10..9a450e0 100644 --- a/res/xml/zen_mode_settings.xml +++ b/res/xml/zen_mode_settings.xml @@ -37,8 +37,8 @@ android:switchTextOn="" /> <SwitchPreference - android:key="phone_calls" - android:title="@string/zen_mode_phone_calls" + android:key="calls" + android:title="@string/zen_mode_calls" android:persistent="false" android:switchTextOff="" android:switchTextOn="" /> |