Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03d5c913 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Update default for conversations in DND" into rvc-dev

parents 7c33cc55 96c9c4f9

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

+4 −4
Original line number Diff line number Diff line
@@ -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";

core/res/res/xml/default_zen_mode_config.xml

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
<!-- Default configuration for zen mode.  See android.service.notification.ZenModeConfig. -->

<zen version="9">

    <allow alarms="true" media="true" system="false" calls="true" callsFrom="2" messages="false"

            reminders="false" events="false" repeatCallers="true" conversations="true"

            conversationsFrom="2"/>

            reminders="false" events="false" repeatCallers="true" convos="false"

            convosFrom="3"/>

    <automatic ruleId="EVENTS_DEFAULT_RULE" enabled="false" snoozing="false" name="Event" zen="1"

               component="android/com.android.server.notification.EventConditionProvider"

               conditionId="condition://android/event?userId=-10000&amp;calendar=&amp;reply=1"/>