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

Simplify DND Behavior secondary text

Browse Source 
Bug: 63077372
Change-Id: I0ac305ff429de27a65667441703b938305d8a03f
Fixes: 70627215
Test: make ROBOTEST_FILTER=ZenModeSettingsTest RunSettingsRoboTests -j40
This commit is contained in:
Beverly
2017-12-13 15:08:30 -05:00
parent 2f7fd8c592
commit 69294a5d5c
4 changed files with 49 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,23 +97,21 @@ public class ZenModeSettings extends ZenModeSettingsBase {
enabledCategories = getEnabledCategories(policy);
}
// no sound categories can bypass dnd
int numCategories = enabledCategories.size();
if (numCategories == 0) {
return mContext.getString(R.string.zen_mode_behavior_no_sound);
return mContext.getString(R.string.zen_mode_behavior_total_silence);
}
String s = enabledCategories.get(0).toLowerCase();
for (int i = 1; i < numCategories; i++) {
if (i == numCategories - 1) {
s = mContext.getString(R.string.join_many_items_last,
s, enabledCategories.get(i).toLowerCase());
} else {
s = mContext.getString(R.string.join_many_items_middle,
s, enabledCategories.get(i).toLowerCase());
}
// only alarms and media/system can bypass dnd
if (numCategories == 2 &&
isCategoryEnabled(policy, Policy.PRIORITY_CATEGORY_ALARMS) &&
isCategoryEnabled(policy, Policy.PRIORITY_CATEGORY_MEDIA_SYSTEM_OTHER)) {
return mContext.getString(R.string.zen_mode_behavior_alarms_only);
}
return mContext.getString(R.string.zen_mode_behavior_no_sound_except, s);
// custom
return mContext.getString(R.string.zen_mode_behavior_summary_custom);
}
String getAutomaticRulesSummary() {