Merge "Update dnd defaults for new users" into pi-dev (e799bda2) · Commits · e / os / android_frameworks_base

core/java/android/service/notification/ZenModeConfig.java

+3 −3

core/res/res/xml/default_zen_mode_config.xml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -19,8 +19,8 @@

	<!-- Default configuration for zen mode. See android.service.notification.ZenModeConfig. -->		<!-- Default configuration for zen mode. See android.service.notification.ZenModeConfig. -->
	<zen version="7">		<zen version="7">
	<allow alarms="true" media="true" system="false" calls="false" callsFrom="2" messages="false"		<allow alarms="true" media="true" system="false" calls="true" callsFrom="2" messages="false"
	reminders="false" events="false" />		reminders="false" events="false" repeatCallers="true" />

	<!-- all visual effects that exist as of P -->		<!-- all visual effects that exist as of P -->
	<disallow suppressedVisualEffect="511" />		<disallow suppressedVisualEffect="511" />

Original line number	Original line	Diff line number	Diff line
	@@ -93,11 +93,11 @@ public class ZenModeConfig implements Parcelable {
	private static final boolean DEFAULT_ALLOW_ALARMS = true;		private static final boolean DEFAULT_ALLOW_ALARMS = true;
	private static final boolean DEFAULT_ALLOW_MEDIA = true;		private static final boolean DEFAULT_ALLOW_MEDIA = true;
	private static final boolean DEFAULT_ALLOW_SYSTEM = false;		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_MESSAGES = false;
	private static final boolean DEFAULT_ALLOW_REMINDERS = false;		private static final boolean DEFAULT_ALLOW_REMINDERS = false;
	private static final boolean DEFAULT_ALLOW_EVENTS = 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 boolean DEFAULT_CHANNELS_BYPASSING_DND = false;
	private static final int DEFAULT_SUPPRESSED_VISUAL_EFFECTS = 0;		private static final int DEFAULT_SUPPRESSED_VISUAL_EFFECTS = 0;

	@@ -486,7 +486,7 @@ public class ZenModeConfig implements Parcelable {
	rt.allowCallsFrom = from;		rt.allowCallsFrom = from;
	rt.allowMessagesFrom = from;		rt.allowMessagesFrom = from;
	} else {		} else {
	rt.allowCallsFrom = DEFAULT_SOURCE;		rt.allowCallsFrom = DEFAULT_CALLS_SOURCE;
	rt.allowMessagesFrom = DEFAULT_SOURCE;		rt.allowMessagesFrom = DEFAULT_SOURCE;
	}		}
	rt.allowAlarms = safeBoolean(parser, ALLOW_ATT_ALARMS, DEFAULT_ALLOW_ALARMS);		rt.allowAlarms = safeBoolean(parser, ALLOW_ATT_ALARMS, DEFAULT_ALLOW_ALARMS);