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

Commit a88e0bd5 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Rename notificationchannel constant values" into sc-dev am: d31299c5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13908693

Change-Id: I486e42a42f19ad46e9f8d91ab84d02aa44c1c33e
parents f9926486 d31299c5

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -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 {

























core/java/android/app/NotificationChannel.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -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)}.