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

Merge "Rename notificationchannel constant values" into sc-dev

Browse Source
This commit is contained in:
Julia Reynolds
2021-03-18 14:03:53 +00:00
committed by Android (Google) Code Review
parent 589035111a 4c8fecf214
commit d31299c5a8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/current.txt
View File

@@ -6137,13 +6137,13 @@ package android.app {
method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.app.NotificationChannel> CREATOR;
field public static final String DEFAULT_CHANNEL_ID = "miscellaneous";
field public static final String EDIT_CONVERSATION = "convo";
field public static final String EDIT_CONVERSATION = "conversation";
field public static final String EDIT_IMPORTANCE = "importance";
field public static final String EDIT_LAUNCHER = "launcher";
field public static final String EDIT_LOCKED_DEVICE = "locked";
field public static final String EDIT_SOUND = "sound";
field public static final String EDIT_VIBRATION = "vibration";
field public static final String EDIT_ZEN = "dnd";
field public static final String EDIT_ZEN = "zen";
}
public final class NotificationChannelGroup implements android.os.Parcelable {

4
core/java/android/app/NotificationChannel.java
View File

@@ -108,13 +108,13 @@ public final class NotificationChannel implements Parcelable {
* Extra value for {@link Settings#EXTRA_CHANNEL_FILTER_LIST}. Include to show fields
* that have to do with editing do not disturb bypass {(@link #setBypassDnd(boolean)}) .
*/
public static final String EDIT_ZEN = "dnd";
public static final String EDIT_ZEN = "zen";
/**
* Extra value for {@link Settings#EXTRA_CHANNEL_FILTER_LIST}. Include to show fields
* that have to do with editing conversation settings (demoting or restoring a channel to
* be a Conversation, changing bubble behavior, or setting the priority of a conversation).
*/
public static final String EDIT_CONVERSATION = "convo";
public static final String EDIT_CONVERSATION = "conversation";
/**
* Extra value for {@link Settings#EXTRA_CHANNEL_FILTER_LIST}. Include to show fields
* that have to do with editing launcher behavior (showing badges)}.