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

Merge "Update dnd defaults for new users" into pi-dev

Browse Source 
am: 8aec7be10e

Change-Id: I2f6bdb45f12e90ea3a1d6ce01f2bebcd82a8b31e
This commit is contained in:
android-build-team Robot
2018-05-04 07:05:10 -07:00
committed by android-build-merger
parent 954dec64b0 8aec7be10e
commit e799bda2e0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/service/notification/ZenModeConfig.java
View File

@@ -93,11 +93,11 @@ public class ZenModeConfig implements Parcelable {
private static final boolean DEFAULT_ALLOW_ALARMS = true;
private static final boolean DEFAULT_ALLOW_MEDIA = true;
private static final boolean DEFAULT_ALLOW_SYSTEM = false;
private static final boolean DEFAULT_ALLOW_CALLS = false;
private static final boolean DEFAULT_ALLOW_CALLS = true;
private static final boolean DEFAULT_ALLOW_MESSAGES = false;
private static final boolean DEFAULT_ALLOW_REMINDERS = false;
private static final boolean DEFAULT_ALLOW_EVENTS = false;
private static final boolean DEFAULT_ALLOW_REPEAT_CALLERS = false;
private static final boolean DEFAULT_ALLOW_REPEAT_CALLERS = true;
private static final boolean DEFAULT_CHANNELS_BYPASSING_DND = false;
private static final int DEFAULT_SUPPRESSED_VISUAL_EFFECTS = 0;
@@ -486,7 +486,7 @@ public class ZenModeConfig implements Parcelable {
rt.allowCallsFrom = from;
rt.allowMessagesFrom = from;
} else {
rt.allowCallsFrom = DEFAULT_SOURCE;
rt.allowCallsFrom = DEFAULT_CALLS_SOURCE;
rt.allowMessagesFrom = DEFAULT_SOURCE;
}
rt.allowAlarms = safeBoolean(parser, ALLOW_ATT_ALARMS, DEFAULT_ALLOW_ALARMS);

4
core/res/res/xml/default_zen_mode_config.xml
View File

@@ -19,8 +19,8 @@
<!-- Default configuration for zen mode. See android.service.notification.ZenModeConfig. -->
<zen version="7">
<allow alarms="true" media="true" system="false" calls="false" callsFrom="2" messages="false"
reminders="false" events="false" />
<allow alarms="true" media="true" system="false" calls="true" callsFrom="2" messages="false"
reminders="false" events="false" repeatCallers="true" />
<!-- all visual effects that exist as of P -->
<disallow suppressedVisualEffect="511" />