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

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

Merge "Add more functionality to channel groups"

parents 2117dfc1 005c8b90

api/current.txt

+6 −0
Original line number Diff line number Diff line
@@ -5162,6 +5162,7 @@ package android.app { 
    field public static final java.lang.String EXTRA_AUDIO_CONTENTS_URI = "android.audioContents";

    field public static final java.lang.String EXTRA_BACKGROUND_IMAGE_URI = "android.backgroundImageUri";

    field public static final java.lang.String EXTRA_BIG_TEXT = "android.bigText";

    field public static final java.lang.String EXTRA_CHANNEL_GROUP_ID = "android.intent.extra.CHANNEL_GROUP_ID";

    field public static final java.lang.String EXTRA_CHANNEL_ID = "android.intent.extra.CHANNEL_ID";

    field public static final java.lang.String EXTRA_CHRONOMETER_COUNT_DOWN = "android.chronometerCountDown";

    field public static final java.lang.String EXTRA_COLORIZED = "android.colorized";
@@ -5577,8 +5578,11 @@ package android.app { 
    method public android.app.NotificationChannelGroup clone();

    method public int describeContents();

    method public java.util.List<android.app.NotificationChannel> getChannels();

    method public java.lang.String getDescription();

    method public java.lang.String getId();

    method public java.lang.CharSequence getName();

    method public boolean isBlocked();

    method public void setDescription(java.lang.String);

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.app.NotificationChannelGroup> CREATOR;

  }
@@ -34892,6 +34896,7 @@ package android.provider { 
    field public static final java.lang.String ACTION_BLUETOOTH_SETTINGS = "android.settings.BLUETOOTH_SETTINGS";

    field public static final java.lang.String ACTION_CAPTIONING_SETTINGS = "android.settings.CAPTIONING_SETTINGS";

    field public static final java.lang.String ACTION_CAST_SETTINGS = "android.settings.CAST_SETTINGS";

    field public static final java.lang.String ACTION_CHANNEL_GROUP_NOTIFICATION_SETTINGS = "android.settings.CHANNEL_GROUP_NOTIFICATION_SETTINGS";

    field public static final java.lang.String ACTION_CHANNEL_NOTIFICATION_SETTINGS = "android.settings.CHANNEL_NOTIFICATION_SETTINGS";

    field public static final java.lang.String ACTION_DATA_ROAMING_SETTINGS = "android.settings.DATA_ROAMING_SETTINGS";

    field public static final java.lang.String ACTION_DATE_SETTINGS = "android.settings.DATE_SETTINGS";
@@ -34951,6 +34956,7 @@ package android.provider { 
    field public static final java.lang.String EXTRA_APP_PACKAGE = "android.provider.extra.APP_PACKAGE";

    field public static final java.lang.String EXTRA_AUTHORITIES = "authorities";

    field public static final java.lang.String EXTRA_BATTERY_SAVER_MODE_ENABLED = "android.settings.extra.battery_saver_mode_enabled";

    field public static final java.lang.String EXTRA_CHANNEL_GROUP_ID = "android.provider.extra.CHANNEL_GROUP_ID";

    field public static final java.lang.String EXTRA_CHANNEL_ID = "android.provider.extra.CHANNEL_ID";

    field public static final java.lang.String EXTRA_DO_NOT_DISTURB_MODE_ENABLED = "android.settings.extra.do_not_disturb_mode_enabled";

    field public static final java.lang.String EXTRA_DO_NOT_DISTURB_MODE_MINUTES = "android.settings.extra.do_not_disturb_mode_minutes";

api/system-current.txt

+6 −0
Original line number Diff line number Diff line
@@ -5347,6 +5347,7 @@ package android.app { 
    field public static final java.lang.String EXTRA_AUDIO_CONTENTS_URI = "android.audioContents";

    field public static final java.lang.String EXTRA_BACKGROUND_IMAGE_URI = "android.backgroundImageUri";

    field public static final java.lang.String EXTRA_BIG_TEXT = "android.bigText";

    field public static final java.lang.String EXTRA_CHANNEL_GROUP_ID = "android.intent.extra.CHANNEL_GROUP_ID";

    field public static final java.lang.String EXTRA_CHANNEL_ID = "android.intent.extra.CHANNEL_ID";

    field public static final java.lang.String EXTRA_CHRONOMETER_COUNT_DOWN = "android.chronometerCountDown";

    field public static final java.lang.String EXTRA_COLORIZED = "android.colorized";
@@ -5783,8 +5784,11 @@ package android.app { 
    method public android.app.NotificationChannelGroup clone();

    method public int describeContents();

    method public java.util.List<android.app.NotificationChannel> getChannels();

    method public java.lang.String getDescription();

    method public java.lang.String getId();

    method public java.lang.CharSequence getName();

    method public boolean isBlocked();

    method public void setDescription(java.lang.String);

    method public org.json.JSONObject toJson() throws org.json.JSONException;

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.app.NotificationChannelGroup> CREATOR;
@@ -37944,6 +37948,7 @@ package android.provider { 
    field public static final java.lang.String ACTION_BLUETOOTH_SETTINGS = "android.settings.BLUETOOTH_SETTINGS";

    field public static final java.lang.String ACTION_CAPTIONING_SETTINGS = "android.settings.CAPTIONING_SETTINGS";

    field public static final java.lang.String ACTION_CAST_SETTINGS = "android.settings.CAST_SETTINGS";

    field public static final java.lang.String ACTION_CHANNEL_GROUP_NOTIFICATION_SETTINGS = "android.settings.CHANNEL_GROUP_NOTIFICATION_SETTINGS";

    field public static final java.lang.String ACTION_CHANNEL_NOTIFICATION_SETTINGS = "android.settings.CHANNEL_NOTIFICATION_SETTINGS";

    field public static final java.lang.String ACTION_DATA_ROAMING_SETTINGS = "android.settings.DATA_ROAMING_SETTINGS";

    field public static final java.lang.String ACTION_DATE_SETTINGS = "android.settings.DATE_SETTINGS";
@@ -38004,6 +38009,7 @@ package android.provider { 
    field public static final java.lang.String EXTRA_APP_PACKAGE = "android.provider.extra.APP_PACKAGE";

    field public static final java.lang.String EXTRA_AUTHORITIES = "authorities";

    field public static final java.lang.String EXTRA_BATTERY_SAVER_MODE_ENABLED = "android.settings.extra.battery_saver_mode_enabled";

    field public static final java.lang.String EXTRA_CHANNEL_GROUP_ID = "android.provider.extra.CHANNEL_GROUP_ID";

    field public static final java.lang.String EXTRA_CHANNEL_ID = "android.provider.extra.CHANNEL_ID";

    field public static final java.lang.String EXTRA_DO_NOT_DISTURB_MODE_ENABLED = "android.settings.extra.do_not_disturb_mode_enabled";

    field public static final java.lang.String EXTRA_DO_NOT_DISTURB_MODE_MINUTES = "android.settings.extra.do_not_disturb_mode_minutes";

api/test-current.txt

+7 −0
Original line number Diff line number Diff line
@@ -5175,6 +5175,7 @@ package android.app { 
    field public static final java.lang.String EXTRA_AUDIO_CONTENTS_URI = "android.audioContents";

    field public static final java.lang.String EXTRA_BACKGROUND_IMAGE_URI = "android.backgroundImageUri";

    field public static final java.lang.String EXTRA_BIG_TEXT = "android.bigText";

    field public static final java.lang.String EXTRA_CHANNEL_GROUP_ID = "android.intent.extra.CHANNEL_GROUP_ID";

    field public static final java.lang.String EXTRA_CHANNEL_ID = "android.intent.extra.CHANNEL_ID";

    field public static final java.lang.String EXTRA_CHRONOMETER_COUNT_DOWN = "android.chronometerCountDown";

    field public static final java.lang.String EXTRA_COLORIZED = "android.colorized";
@@ -5590,8 +5591,12 @@ package android.app { 
    method public android.app.NotificationChannelGroup clone();

    method public int describeContents();

    method public java.util.List<android.app.NotificationChannel> getChannels();

    method public java.lang.String getDescription();

    method public java.lang.String getId();

    method public java.lang.CharSequence getName();

    method public boolean isBlocked();

    method public void setBlocked(boolean);

    method public void setDescription(java.lang.String);

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.app.NotificationChannelGroup> CREATOR;

  }
@@ -35069,6 +35074,7 @@ package android.provider { 
    field public static final java.lang.String ACTION_BLUETOOTH_SETTINGS = "android.settings.BLUETOOTH_SETTINGS";

    field public static final java.lang.String ACTION_CAPTIONING_SETTINGS = "android.settings.CAPTIONING_SETTINGS";

    field public static final java.lang.String ACTION_CAST_SETTINGS = "android.settings.CAST_SETTINGS";

    field public static final java.lang.String ACTION_CHANNEL_GROUP_NOTIFICATION_SETTINGS = "android.settings.CHANNEL_GROUP_NOTIFICATION_SETTINGS";

    field public static final java.lang.String ACTION_CHANNEL_NOTIFICATION_SETTINGS = "android.settings.CHANNEL_NOTIFICATION_SETTINGS";

    field public static final java.lang.String ACTION_DATA_ROAMING_SETTINGS = "android.settings.DATA_ROAMING_SETTINGS";

    field public static final java.lang.String ACTION_DATE_SETTINGS = "android.settings.DATE_SETTINGS";
@@ -35129,6 +35135,7 @@ package android.provider { 
    field public static final java.lang.String EXTRA_APP_PACKAGE = "android.provider.extra.APP_PACKAGE";

    field public static final java.lang.String EXTRA_AUTHORITIES = "authorities";

    field public static final java.lang.String EXTRA_BATTERY_SAVER_MODE_ENABLED = "android.settings.extra.battery_saver_mode_enabled";

    field public static final java.lang.String EXTRA_CHANNEL_GROUP_ID = "android.provider.extra.CHANNEL_GROUP_ID";

    field public static final java.lang.String EXTRA_CHANNEL_ID = "android.provider.extra.CHANNEL_ID";

    field public static final java.lang.String EXTRA_DO_NOT_DISTURB_MODE_ENABLED = "android.settings.extra.do_not_disturb_mode_enabled";

    field public static final java.lang.String EXTRA_DO_NOT_DISTURB_MODE_MINUTES = "android.settings.extra.do_not_disturb_mode_minutes";

core/java/android/app/INotificationManager.aidl

+3 −0
Original line number Diff line number Diff line
@@ -61,6 +61,8 @@ interface INotificationManager 
    void createNotificationChannelsForPackage(String pkg, int uid, in ParceledListSlice channelsList);

    ParceledListSlice getNotificationChannelGroupsForPackage(String pkg, int uid, boolean includeDeleted);

    NotificationChannelGroup getNotificationChannelGroupForPackage(String groupId, String pkg, int uid);

    NotificationChannelGroup getPopulatedNotificationChannelGroupForPackage(String pkg, int uid, String groupId, boolean includeDeleted);

    void updateNotificationChannelGroupForPackage(String pkg, int uid, in NotificationChannelGroup group);

    void updateNotificationChannelForPackage(String pkg, int uid, in NotificationChannel channel);

    NotificationChannel getNotificationChannel(String pkg, String channelId);

    NotificationChannel getNotificationChannelForPackage(String pkg, int uid, String channelId, boolean includeDeleted);
@@ -103,6 +105,7 @@ interface INotificationManager 
    void setOnNotificationPostedTrimFromListener(in INotificationListener token, int trim);

    void setInterruptionFilter(String pkg, int interruptionFilter);



    void updateNotificationChannelGroupFromPrivilegedListener(in INotificationListener token, String pkg, in UserHandle user, in NotificationChannelGroup group);

    void updateNotificationChannelFromPrivilegedListener(in INotificationListener token, String pkg, in UserHandle user, in NotificationChannel channel);

    ParceledListSlice getNotificationChannelsFromPrivilegedListener(in INotificationListener token, String pkg, in UserHandle user);

    ParceledListSlice getNotificationChannelGroupsFromPrivilegedListener(in INotificationListener token, String pkg, in UserHandle user);

core/java/android/app/Notification.java

+7 −0
Original line number Diff line number Diff line
@@ -122,6 +122,13 @@ public class Notification implements Parcelable 
     */

    public static final String EXTRA_CHANNEL_ID = "android.intent.extra.CHANNEL_ID";



    /**

     * Optional extra for {@link #INTENT_CATEGORY_NOTIFICATION_PREFERENCES}. If provided, will

     * contain a {@link NotificationChannelGroup#getId() group id} that can be used to narrow down

     * what settings should be shown in the target app.

     */

    public static final String EXTRA_CHANNEL_GROUP_ID = "android.intent.extra.CHANNEL_GROUP_ID";



    /**

     * Optional extra for {@link #INTENT_CATEGORY_NOTIFICATION_PREFERENCES}. If provided, will

     * contain the tag provided to {@link NotificationManager#notify(String, int, Notification)}