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

Commit e071abda authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Notification cleanup 

- remove EXTRA_ORIGINATING_USER_ID
- deprecate two icon extra fields; use the getters instead
- rename badge icon methods
- update some unclear documentation

Test: make, cts
Fixes: 33666468
Fixes: 36128288
Change-Id: Ic477259aab5f267fb72ab715d72195d6364cedae
parent dddc8fd1

api/current.txt

+4 −4
Original line number Diff line number Diff line
@@ -5094,7 +5094,7 @@ package android.app { 
    ctor public Notification(android.os.Parcel);

    method public android.app.Notification clone();

    method public int describeContents();

    method public int getBadgeIcon();

    method public int getBadgeIconType();

    method public java.lang.String getChannel();

    method public java.lang.String getGroup();

    method public android.graphics.drawable.Icon getLargeIcon();
@@ -5138,7 +5138,7 @@ package android.app { 
    field public static final java.lang.String EXTRA_CONVERSATION_TITLE = "android.conversationTitle";

    field public static final java.lang.String EXTRA_HISTORIC_MESSAGES = "android.messages.historic";

    field public static final java.lang.String EXTRA_INFO_TEXT = "android.infoText";

    field public static final java.lang.String EXTRA_LARGE_ICON = "android.largeIcon";

    field public static final deprecated java.lang.String EXTRA_LARGE_ICON = "android.largeIcon";

    field public static final java.lang.String EXTRA_LARGE_ICON_BIG = "android.largeIcon.big";

    field public static final java.lang.String EXTRA_MEDIA_SESSION = "android.mediaSession";

    field public static final java.lang.String EXTRA_MESSAGES = "android.messages";
@@ -5151,7 +5151,7 @@ package android.app { 
    field public static final java.lang.String EXTRA_SELF_DISPLAY_NAME = "android.selfDisplayName";

    field public static final java.lang.String EXTRA_SHOW_CHRONOMETER = "android.showChronometer";

    field public static final java.lang.String EXTRA_SHOW_WHEN = "android.showWhen";

    field public static final java.lang.String EXTRA_SMALL_ICON = "android.icon";

    field public static final deprecated java.lang.String EXTRA_SMALL_ICON = "android.icon";

    field public static final java.lang.String EXTRA_SUB_TEXT = "android.subText";

    field public static final java.lang.String EXTRA_SUMMARY_TEXT = "android.summaryText";

    field public static final java.lang.String EXTRA_TEMPLATE = "android.template";
@@ -5287,7 +5287,7 @@ package android.app { 
    method public android.app.Notification.Builder addExtras(android.os.Bundle);

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

    method public android.app.Notification build();

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

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

    method public android.widget.RemoteViews createBigContentView();

    method public android.widget.RemoteViews createContentView();

    method public android.widget.RemoteViews createHeadsUpContentView();

api/removed.txt

+5 −0
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);

  }



  public static class Notification.Builder {

    method public deprecated android.app.Notification.Builder chooseBadgeIcon(int);

  }



  public final class RecoverableSecurityException extends java.lang.SecurityException implements android.os.Parcelable {

    method public deprecated void showAsNotification(android.content.Context);

  }

api/system-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -5264,7 +5264,7 @@ package android.app { 
    ctor public Notification(android.os.Parcel);

    method public android.app.Notification clone();

    method public int describeContents();

    method public int getBadgeIcon();

    method public int getBadgeIconType();

    method public java.lang.String getChannel();

    method public java.lang.String getGroup();

    method public android.graphics.drawable.Icon getLargeIcon();
@@ -5309,7 +5309,7 @@ package android.app { 
    field public static final java.lang.String EXTRA_CONVERSATION_TITLE = "android.conversationTitle";

    field public static final java.lang.String EXTRA_HISTORIC_MESSAGES = "android.messages.historic";

    field public static final java.lang.String EXTRA_INFO_TEXT = "android.infoText";

    field public static final java.lang.String EXTRA_LARGE_ICON = "android.largeIcon";

    field public static final deprecated java.lang.String EXTRA_LARGE_ICON = "android.largeIcon";

    field public static final java.lang.String EXTRA_LARGE_ICON_BIG = "android.largeIcon.big";

    field public static final java.lang.String EXTRA_MEDIA_SESSION = "android.mediaSession";

    field public static final java.lang.String EXTRA_MESSAGES = "android.messages";
@@ -5322,7 +5322,7 @@ package android.app { 
    field public static final java.lang.String EXTRA_SELF_DISPLAY_NAME = "android.selfDisplayName";

    field public static final java.lang.String EXTRA_SHOW_CHRONOMETER = "android.showChronometer";

    field public static final java.lang.String EXTRA_SHOW_WHEN = "android.showWhen";

    field public static final java.lang.String EXTRA_SMALL_ICON = "android.icon";

    field public static final deprecated java.lang.String EXTRA_SMALL_ICON = "android.icon";

    field public static final java.lang.String EXTRA_SUBSTITUTE_APP_NAME = "android.substName";

    field public static final java.lang.String EXTRA_SUB_TEXT = "android.subText";

    field public static final java.lang.String EXTRA_SUMMARY_TEXT = "android.summaryText";
@@ -5460,7 +5460,7 @@ package android.app { 
    method public android.app.Notification.Builder addExtras(android.os.Bundle);

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

    method public android.app.Notification build();

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

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

    method public android.widget.RemoteViews createBigContentView();

    method public android.widget.RemoteViews createContentView();

    method public android.widget.RemoteViews createHeadsUpContentView();

api/system-removed.txt

+5 −0
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);

  }



  public static class Notification.Builder {

    method public deprecated android.app.Notification.Builder chooseBadgeIcon(int);

  }



  public final class RecoverableSecurityException extends java.lang.SecurityException implements android.os.Parcelable {

    method public deprecated void showAsNotification(android.content.Context);

  }

api/test-current.txt

+4 −4
Original line number Diff line number Diff line
@@ -5104,7 +5104,7 @@ package android.app { 
    ctor public Notification(android.os.Parcel);

    method public android.app.Notification clone();

    method public int describeContents();

    method public int getBadgeIcon();

    method public int getBadgeIconType();

    method public java.lang.String getChannel();

    method public java.lang.String getGroup();

    method public android.graphics.drawable.Icon getLargeIcon();
@@ -5148,7 +5148,7 @@ package android.app { 
    field public static final java.lang.String EXTRA_CONVERSATION_TITLE = "android.conversationTitle";

    field public static final java.lang.String EXTRA_HISTORIC_MESSAGES = "android.messages.historic";

    field public static final java.lang.String EXTRA_INFO_TEXT = "android.infoText";

    field public static final java.lang.String EXTRA_LARGE_ICON = "android.largeIcon";

    field public static final deprecated java.lang.String EXTRA_LARGE_ICON = "android.largeIcon";

    field public static final java.lang.String EXTRA_LARGE_ICON_BIG = "android.largeIcon.big";

    field public static final java.lang.String EXTRA_MEDIA_SESSION = "android.mediaSession";

    field public static final java.lang.String EXTRA_MESSAGES = "android.messages";
@@ -5161,7 +5161,7 @@ package android.app { 
    field public static final java.lang.String EXTRA_SELF_DISPLAY_NAME = "android.selfDisplayName";

    field public static final java.lang.String EXTRA_SHOW_CHRONOMETER = "android.showChronometer";

    field public static final java.lang.String EXTRA_SHOW_WHEN = "android.showWhen";

    field public static final java.lang.String EXTRA_SMALL_ICON = "android.icon";

    field public static final deprecated java.lang.String EXTRA_SMALL_ICON = "android.icon";

    field public static final java.lang.String EXTRA_SUB_TEXT = "android.subText";

    field public static final java.lang.String EXTRA_SUMMARY_TEXT = "android.summaryText";

    field public static final java.lang.String EXTRA_TEMPLATE = "android.template";
@@ -5297,7 +5297,7 @@ package android.app { 
    method public android.app.Notification.Builder addExtras(android.os.Bundle);

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

    method public android.app.Notification build();

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

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

    method public android.widget.RemoteViews createBigContentView();

    method public android.widget.RemoteViews createContentView();

    method public android.widget.RemoteViews createHeadsUpContentView();