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

am 196aaceb: Merge "Settings: Display \'Calls\' category on non-voice devices." into lmp-mr1-dev

Browse Source 
* commit '196aacebf9ac9dd4ffedc3012f59285be499e470':
  Settings: Display 'Calls' category on non-voice devices.
This commit is contained in:
John Spurlock
2014-10-21 16:19:46 +00:00
committed by Android Git Automerger
parent 46de83aa1c 196aacebf9
commit e926cd5cc4
3 changed files with 20 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/values/strings.xml
View File

@@ -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>

4
res/xml/zen_mode_settings.xml
View File

@@ -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="" />