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

Commit 5bc54aad authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Allow some notifications in a group to be muted" into oc-dev 

am: 9685128e

Change-Id: I0a2823475a81c6570c6644153a8f7302dc59b058
parents 31f94f28 9685128e

api/current.txt

+5 −0
Original line number Diff line number Diff line
@@ -5123,6 +5123,7 @@ package android.app { 
    method public int getBadgeIconType();

    method public java.lang.String getChannel();

    method public java.lang.String getGroup();

    method public int getGroupAlertBehavior();

    method public android.graphics.drawable.Icon getLargeIcon();

    method public java.lang.CharSequence getSettingsText();

    method public java.lang.String getShortcutId();
@@ -5198,6 +5199,9 @@ package android.app { 
    field public static final int FLAG_ONGOING_EVENT = 2; // 0x2

    field public static final int FLAG_ONLY_ALERT_ONCE = 8; // 0x8

    field public static final deprecated int FLAG_SHOW_LIGHTS = 1; // 0x1

    field public static final int GROUP_ALERT_ALL = 0; // 0x0

    field public static final int GROUP_ALERT_CHILDREN = 2; // 0x2

    field public static final int GROUP_ALERT_SUMMARY = 1; // 0x1

    field public static final java.lang.String INTENT_CATEGORY_NOTIFICATION_PREFERENCES = "android.intent.category.NOTIFICATION_PREFERENCES";

    field public static final deprecated int PRIORITY_DEFAULT = 0; // 0x0

    field public static final deprecated int PRIORITY_HIGH = 1; // 0x1
@@ -5344,6 +5348,7 @@ package android.app { 
    method public android.app.Notification.Builder setExtras(android.os.Bundle);

    method public android.app.Notification.Builder setFullScreenIntent(android.app.PendingIntent, boolean);

    method public android.app.Notification.Builder setGroup(java.lang.String);

    method public android.app.Notification.Builder setGroupAlertBehavior(int);

    method public android.app.Notification.Builder setGroupSummary(boolean);

    method public android.app.Notification.Builder setLargeIcon(android.graphics.Bitmap);

    method public android.app.Notification.Builder setLargeIcon(android.graphics.drawable.Icon);

api/removed.txt

+0 −1
Original line number Diff line number Diff line 
package android.app {



  public class Notification implements android.os.Parcelable {

    method public deprecated int getBadgeIcon();

    method public deprecated void setLatestEventInfo(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent);

  }

api/system-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -5303,6 +5303,7 @@ package android.app { 
    method public int getBadgeIconType();

    method public java.lang.String getChannel();

    method public java.lang.String getGroup();

    method public int getGroupAlertBehavior();

    method public android.graphics.drawable.Icon getLargeIcon();

    method public static java.lang.Class<? extends android.app.Notification.Style> getNotificationStyleClass(java.lang.String);

    method public java.lang.CharSequence getSettingsText();
@@ -5382,6 +5383,9 @@ package android.app { 
    field public static final int FLAG_ONGOING_EVENT = 2; // 0x2

    field public static final int FLAG_ONLY_ALERT_ONCE = 8; // 0x8

    field public static final deprecated int FLAG_SHOW_LIGHTS = 1; // 0x1

    field public static final int GROUP_ALERT_ALL = 0; // 0x0

    field public static final int GROUP_ALERT_CHILDREN = 2; // 0x2

    field public static final int GROUP_ALERT_SUMMARY = 1; // 0x1

    field public static final java.lang.String INTENT_CATEGORY_NOTIFICATION_PREFERENCES = "android.intent.category.NOTIFICATION_PREFERENCES";

    field public static final deprecated int PRIORITY_DEFAULT = 0; // 0x0

    field public static final deprecated int PRIORITY_HIGH = 1; // 0x1
@@ -5528,6 +5532,7 @@ package android.app { 
    method public android.app.Notification.Builder setExtras(android.os.Bundle);

    method public android.app.Notification.Builder setFullScreenIntent(android.app.PendingIntent, boolean);

    method public android.app.Notification.Builder setGroup(java.lang.String);

    method public android.app.Notification.Builder setGroupAlertBehavior(int);

    method public android.app.Notification.Builder setGroupSummary(boolean);

    method public android.app.Notification.Builder setLargeIcon(android.graphics.Bitmap);

    method public android.app.Notification.Builder setLargeIcon(android.graphics.drawable.Icon);

api/system-removed.txt

+0 −1
Original line number Diff line number Diff line 
package android.app {



  public class Notification implements android.os.Parcelable {

    method public deprecated int getBadgeIcon();

    method public deprecated void setLatestEventInfo(android.content.Context, java.lang.CharSequence, java.lang.CharSequence, android.app.PendingIntent);

  }

api/test-current.txt

+5 −0
Original line number Diff line number Diff line
@@ -5136,6 +5136,7 @@ package android.app { 
    method public int getBadgeIconType();

    method public java.lang.String getChannel();

    method public java.lang.String getGroup();

    method public int getGroupAlertBehavior();

    method public android.graphics.drawable.Icon getLargeIcon();

    method public java.lang.CharSequence getSettingsText();

    method public java.lang.String getShortcutId();
@@ -5211,6 +5212,9 @@ package android.app { 
    field public static final int FLAG_ONGOING_EVENT = 2; // 0x2

    field public static final int FLAG_ONLY_ALERT_ONCE = 8; // 0x8

    field public static final deprecated int FLAG_SHOW_LIGHTS = 1; // 0x1

    field public static final int GROUP_ALERT_ALL = 0; // 0x0

    field public static final int GROUP_ALERT_CHILDREN = 2; // 0x2

    field public static final int GROUP_ALERT_SUMMARY = 1; // 0x1

    field public static final java.lang.String INTENT_CATEGORY_NOTIFICATION_PREFERENCES = "android.intent.category.NOTIFICATION_PREFERENCES";

    field public static final deprecated int PRIORITY_DEFAULT = 0; // 0x0

    field public static final deprecated int PRIORITY_HIGH = 1; // 0x1
@@ -5357,6 +5361,7 @@ package android.app { 
    method public android.app.Notification.Builder setExtras(android.os.Bundle);

    method public android.app.Notification.Builder setFullScreenIntent(android.app.PendingIntent, boolean);

    method public android.app.Notification.Builder setGroup(java.lang.String);

    method public android.app.Notification.Builder setGroupAlertBehavior(int);

    method public android.app.Notification.Builder setGroupSummary(boolean);

    method public android.app.Notification.Builder setLargeIcon(android.graphics.Bitmap);

    method public android.app.Notification.Builder setLargeIcon(android.graphics.drawable.Icon);