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

Merge "Update default for conversations in DND" into rvc-dev am: 03d5c91379

Browse Source 
Change-Id: Ia990e8ae67baced456f9a55f6018967d32080319
This commit is contained in:
Julia Reynolds
2020-04-21 10:54:39 +00:00
committed by Automerger Merge Worker
parent 9f8f7a2a59 03d5c91379
commit 27bee7bfc5
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,8 +102,8 @@ public class ZenModeConfig implements Parcelable {
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 = true; private static final boolean DEFAULT_ALLOW_REPEAT_CALLERS = true;
private static final boolean DEFAULT_ALLOW_CONV = true; private static final boolean DEFAULT_ALLOW_CONV = false;
private static final int DEFAULT_ALLOW_CONV_FROM = ZenPolicy.CONVERSATION_SENDERS_IMPORTANT; private static final int DEFAULT_ALLOW_CONV_FROM = ZenPolicy.CONVERSATION_SENDERS_NONE;
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;
@@ -125,8 +125,8 @@ public class ZenModeConfig implements Parcelable {
private static final String ALLOW_ATT_EVENTS = "events"; private static final String ALLOW_ATT_EVENTS = "events";
private static final String ALLOW_ATT_SCREEN_OFF = "visualScreenOff"; private static final String ALLOW_ATT_SCREEN_OFF = "visualScreenOff";
private static final String ALLOW_ATT_SCREEN_ON = "visualScreenOn"; private static final String ALLOW_ATT_SCREEN_ON = "visualScreenOn";
private static final String ALLOW_ATT_CONV = "conv"; private static final String ALLOW_ATT_CONV = "convos";
private static final String ALLOW_ATT_CONV_FROM = "convFrom"; private static final String ALLOW_ATT_CONV_FROM = "convosFrom";
private static final String DISALLOW_TAG = "disallow"; private static final String DISALLOW_TAG = "disallow";
private static final String DISALLOW_ATT_VISUAL_EFFECTS = "visualEffects"; private static final String DISALLOW_ATT_VISUAL_EFFECTS = "visualEffects";
private static final String STATE_TAG = "state"; private static final String STATE_TAG = "state";

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

@@ -20,8 +20,8 @@
<!-- Default configuration for zen mode. See android.service.notification.ZenModeConfig. --> <!-- Default configuration for zen mode. See android.service.notification.ZenModeConfig. -->
<zen version="9"> <zen version="9">
<allow alarms="true" media="true" system="false" calls="true" callsFrom="2" messages="false" <allow alarms="true" media="true" system="false" calls="true" callsFrom="2" messages="false"
reminders="false" events="false" repeatCallers="true" conversations="true" reminders="false" events="false" repeatCallers="true" convos="false"
conversationsFrom="2"/> convosFrom="3"/>
<automatic ruleId="EVENTS_DEFAULT_RULE" enabled="false" snoozing="false" name="Event" zen="1" <automatic ruleId="EVENTS_DEFAULT_RULE" enabled="false" snoozing="false" name="Event" zen="1"
component="android/com.android.server.notification.EventConditionProvider" component="android/com.android.server.notification.EventConditionProvider"
conditionId="condition://android/event?userId=-10000&amp;calendar=&amp;reply=1"/> conditionId="condition://android/event?userId=-10000&amp;calendar=&amp;reply=1"/>