From 96c9c4f967d8e57b7e02f6356f78114ed2091f55 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Mon, 20 Apr 2020 12:56:46 -0400 Subject: [PATCH] Update default for conversations in DND Including a one time reset of dogfooders/dev preview users Test: manual - value is reset on first boot Test: manual - change value, reboot, value is maintained Fixes: 154234926 Change-Id: I5e4b338d6d7cc30dec1b12d31c3f1461c6f664cc --- core/java/android/service/notification/ZenModeConfig.java | 8 ++++---- core/res/res/xml/default_zen_mode_config.xml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/java/android/service/notification/ZenModeConfig.java b/core/java/android/service/notification/ZenModeConfig.java index af915966e7eb4..1f6555c85a667 100644 --- a/core/java/android/service/notification/ZenModeConfig.java +++ b/core/java/android/service/notification/ZenModeConfig.java @@ -102,8 +102,8 @@ public class ZenModeConfig implements Parcelable { private static final boolean DEFAULT_ALLOW_REMINDERS = false; private static final boolean DEFAULT_ALLOW_EVENTS = false; private static final boolean DEFAULT_ALLOW_REPEAT_CALLERS = true; - private static final boolean DEFAULT_ALLOW_CONV = true; - private static final int DEFAULT_ALLOW_CONV_FROM = ZenPolicy.CONVERSATION_SENDERS_IMPORTANT; + private static final boolean DEFAULT_ALLOW_CONV = false; + private static final int DEFAULT_ALLOW_CONV_FROM = ZenPolicy.CONVERSATION_SENDERS_NONE; private static final boolean DEFAULT_CHANNELS_BYPASSING_DND = false; private static final int DEFAULT_SUPPRESSED_VISUAL_EFFECTS = 0; @@ -125,8 +125,8 @@ public class ZenModeConfig implements Parcelable { private static final String ALLOW_ATT_EVENTS = "events"; private static final String ALLOW_ATT_SCREEN_OFF = "visualScreenOff"; private static final String ALLOW_ATT_SCREEN_ON = "visualScreenOn"; - private static final String ALLOW_ATT_CONV = "conv"; - private static final String ALLOW_ATT_CONV_FROM = "convFrom"; + private static final String ALLOW_ATT_CONV = "convos"; + private static final String ALLOW_ATT_CONV_FROM = "convosFrom"; private static final String DISALLOW_TAG = "disallow"; private static final String DISALLOW_ATT_VISUAL_EFFECTS = "visualEffects"; private static final String STATE_TAG = "state"; diff --git a/core/res/res/xml/default_zen_mode_config.xml b/core/res/res/xml/default_zen_mode_config.xml index 9110661536e2a..873b9ebe4f1ae 100644 --- a/core/res/res/xml/default_zen_mode_config.xml +++ b/core/res/res/xml/default_zen_mode_config.xml @@ -20,8 +20,8 @@ + reminders="false" events="false" repeatCallers="true" convos="false" + convosFrom="3"/>