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

Zen settings screen update

Browse Source 
am: 56b748d686

Change-Id: Iaac694915e20e5dc0f5edd0d1be17321621caa6e
This commit is contained in:
Julia Reynolds
2017-07-21 16:21:25 +00:00
committed by android-build-merger
parent 0eae770acc 56b748d686
commit 4faa353f02
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -6686,7 +6686,7 @@
<string name="zen_mode_summary_combination"><xliff:g id="mode" example="Priority only">%1$s</xliff:g>: <xliff:g id="exit condition" example="Until you turn this off">%2$s</xliff:g></string> <string name="zen_mode_summary_combination"><xliff:g id="mode" example="Priority only">%1$s</xliff:g>: <xliff:g id="exit condition" example="Until you turn this off">%2$s</xliff:g></string>
<!-- Do not disturb: Title for the Visual interruptions option and associated settings page. [CHAR LIMIT=30] --> <!-- Do not disturb: Title for the Visual interruptions option and associated settings page. [CHAR LIMIT=30] -->
<string name="zen_mode_visual_interruptions_settings_title">Block visual disturbances</string> <string name="zen_mode_visual_interruptions_settings_title">Block visual signals</string>
<!-- Work Sounds: Work sound settings section header. [CHAR LIMIT=50] --> <!-- Work Sounds: Work sound settings section header. [CHAR LIMIT=50] -->
<string name="sound_work_settings">Work profile sounds</string> <string name="sound_work_settings">Work profile sounds</string>

4
src/com/android/settings/notification/ZenModeSettings.java
View File

@@ -172,9 +172,7 @@ public class ZenModeSettings extends ZenModeSettingsBase {
? getString(R.string.switch_off_text) ? getString(R.string.switch_off_text)
: getString(R.string.zen_mode_rule_summary_enabled_combination, mode); : getString(R.string.zen_mode_rule_summary_enabled_combination, mode);
return isSystemRule ? ruleState return ruleState;
: getString(R.string.zen_mode_rule_summary_provider_combination,
providerLabel, ruleState);
} }
private static ManagedServiceSettings.Config getConditionProviderConfig() { private static ManagedServiceSettings.Config getConditionProviderConfig() {