diff options
| author | Julia Reynolds <juliacr@google.com> | 2020-04-20 19:44:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-04-20 19:44:13 +0000 |
| commit | 03d5c91379fad9c8ca2aed35d0dcbdcf87d6d7d5 (patch) | |
| tree | 8b28cee711911ba9ab104bd88031c5ec4c15ac42 /core/java/android | |
| parent | 7c33cc554d356cb28fd222c04090f70da2b27ae5 (diff) | |
| parent | 96c9c4f967d8e57b7e02f6356f78114ed2091f55 (diff) | |
Merge "Update default for conversations in DND" into rvc-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/service/notification/ZenModeConfig.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/service/notification/ZenModeConfig.java b/core/java/android/service/notification/ZenModeConfig.java index af915966e7eb..1f6555c85a66 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"; |