Update Sound settings.

- change the summary to show the automatic rules info instead.
- removed ringtone preference category
- add dividers above DND and Emergency broadcast

Change-Id: Iee497d194b70af72cfd69b315d639ca62720643b
Fix: 34975939
Test: make RunSettingsRoboTests
This commit is contained in:
Doris Ling
2017-03-24 14:37:07 -07:00
parent d3505c76cd
commit df4c67cc69
5 changed files with 73 additions and 42 deletions

View File

@@ -16,6 +16,7 @@
package com.android.settings.notification;
import android.app.AutomaticZenRule;
import android.app.NotificationManager;
import android.app.NotificationManager.Policy;
import android.content.Context;
@@ -26,6 +27,9 @@ import android.support.v7.preference.PreferenceScreen;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
public class ZenModeSettings extends ZenModeSettingsBase {
private static final String KEY_PRIORITY_SETTINGS = "priority_settings";
@@ -137,6 +141,29 @@ public class ZenModeSettings extends ZenModeSettingsBase {
return s;
}
String getAutomaticRulesSummary() {
final int count = getEnabledAutomaticRulesCount();
return count == 0 ? mContext.getString(R.string.zen_mode_settings_summary_off)
: mContext.getResources().getQuantityString(
R.plurals.zen_mode_settings_summary_on, count, count);
}
@VisibleForTesting
int getEnabledAutomaticRulesCount() {
int count = 0;
final Map<String, AutomaticZenRule> ruleMap =
NotificationManager.from(mContext).getAutomaticZenRules();
if (ruleMap != null) {
for (Entry<String, AutomaticZenRule> ruleEntry : ruleMap.entrySet()) {
final AutomaticZenRule rule = ruleEntry.getValue();
if (rule != null && rule.isEnabled()) {
count++;
}
}
}
return count;
}
@VisibleForTesting
String append(String s, boolean condition, int resId) {
if (condition) {