Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Default zen rules updated."

Browse Source
This commit is contained in:
Beverly Tai
2017-10-18 13:34:28 +00:00
committed by Android (Google) Code Review
parent 9fc9edf95a 30bfbcac90
commit 684585c405
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/notification/ZenModeHelper.java
View File

@@ -126,12 +126,6 @@ public class ZenModeHelper {
mAppOps = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
mDefaultConfig = new ZenModeConfig();
mDefaultRuleWeeknightsName = mContext.getResources()
.getString(R.string.zen_mode_default_weeknights_name);
mDefaultRuleWeekendsName = mContext.getResources()
.getString(R.string.zen_mode_default_weekends_name);
mDefaultRuleEventsName = mContext.getResources()
.getString(R.string.zen_mode_default_events_name);
setDefaultZenRules(mContext);
mConfig = mDefaultConfig;
mConfigs.put(UserHandle.USER_SYSTEM, mConfig);
@@ -436,6 +430,7 @@ public class ZenModeHelper {
}
private void appendDefaultRules (ZenModeConfig config) {
getDefaultRuleNames();
appendDefaultScheduleRules(config);
appendDefaultEventRules(config);
}
@@ -815,6 +810,16 @@ public class ZenModeHelper {
}
}
private void getDefaultRuleNames() {
// on locale-change, these values differ
mDefaultRuleWeeknightsName = mContext.getResources()
.getString(R.string.zen_mode_default_weeknights_name);
mDefaultRuleWeekendsName = mContext.getResources()
.getString(R.string.zen_mode_default_weekends_name);
mDefaultRuleEventsName = mContext.getResources()
.getString(R.string.zen_mode_default_events_name);
}
@VisibleForTesting
protected void applyRestrictions() {
final boolean zen = mZenMode != Global.ZEN_MODE_OFF;
@@ -928,6 +933,7 @@ public class ZenModeHelper {
weeknights.days = ZenModeConfig.WEEKNIGHT_DAYS;
weeknights.startHour = 22;
weeknights.endHour = 7;
weeknights.exitAtAlarm = true;
final ZenRule rule1 = new ZenRule();
rule1.enabled = false;
rule1.name = mDefaultRuleWeeknightsName;
@@ -943,6 +949,7 @@ public class ZenModeHelper {
weekends.startHour = 23;
weekends.startMinute = 30;
weekends.endHour = 10;
weekends.exitAtAlarm = true;
final ZenRule rule2 = new ZenRule();
rule2.enabled = false;
rule2.name = mDefaultRuleWeekendsName;