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

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

Merge "Stop populating RemoteViews in Notifications."

parents 463ba436 d9228f11

api/current.txt

+12 −4
Original line number Diff line number Diff line
@@ -4830,17 +4830,17 @@ package android.app { 
    field public android.app.Notification.Action[] actions;

    field public android.media.AudioAttributes audioAttributes;

    field public deprecated int audioStreamType;

    field public android.widget.RemoteViews bigContentView;

    field public deprecated android.widget.RemoteViews bigContentView;

    field public java.lang.String category;

    field public int color;

    field public android.app.PendingIntent contentIntent;

    field public android.widget.RemoteViews contentView;

    field public deprecated android.widget.RemoteViews contentView;

    field public int defaults;

    field public android.app.PendingIntent deleteIntent;

    field public android.os.Bundle extras;

    field public int flags;

    field public android.app.PendingIntent fullScreenIntent;

    field public android.widget.RemoteViews headsUpContentView;

    field public deprecated android.widget.RemoteViews headsUpContentView;

    field public deprecated int icon;

    field public int iconLevel;

    field public deprecated android.graphics.Bitmap largeIcon;
@@ -4931,14 +4931,22 @@ package android.app { 
    method public android.app.Notification.Builder extend(android.app.Notification.Extender);

    method public android.os.Bundle getExtras();

    method public deprecated android.app.Notification getNotification();

    method public android.widget.RemoteViews makeBigContentView();

    method public android.widget.RemoteViews makeContentView();

    method public android.widget.RemoteViews makeHeadsUpContentView();

    method public static android.app.Notification.Builder recoverBuilder(android.content.Context, android.app.Notification);

    method public android.app.Notification.Builder setActions(android.app.Notification.Action...);

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

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

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

    method public android.app.Notification.Builder setContent(android.widget.RemoteViews);

    method public deprecated android.app.Notification.Builder setContent(android.widget.RemoteViews);

    method public android.app.Notification.Builder setContentInfo(java.lang.CharSequence);

    method public android.app.Notification.Builder setContentIntent(android.app.PendingIntent);

    method public android.app.Notification.Builder setContentText(java.lang.CharSequence);

    method public android.app.Notification.Builder setContentTitle(java.lang.CharSequence);

    method public android.app.Notification.Builder setCustomBigContentView(android.widget.RemoteViews);

    method public android.app.Notification.Builder setCustomContentView(android.widget.RemoteViews);

    method public android.app.Notification.Builder setCustomHeadsUpContentView(android.widget.RemoteViews);

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

    method public android.app.Notification.Builder setDeleteIntent(android.app.PendingIntent);

    method public android.app.Notification.Builder setExtras(android.os.Bundle);

api/system-current.txt

+12 −4
Original line number Diff line number Diff line
@@ -4947,17 +4947,17 @@ package android.app { 
    field public android.app.Notification.Action[] actions;

    field public android.media.AudioAttributes audioAttributes;

    field public deprecated int audioStreamType;

    field public android.widget.RemoteViews bigContentView;

    field public deprecated android.widget.RemoteViews bigContentView;

    field public java.lang.String category;

    field public int color;

    field public android.app.PendingIntent contentIntent;

    field public android.widget.RemoteViews contentView;

    field public deprecated android.widget.RemoteViews contentView;

    field public int defaults;

    field public android.app.PendingIntent deleteIntent;

    field public android.os.Bundle extras;

    field public int flags;

    field public android.app.PendingIntent fullScreenIntent;

    field public android.widget.RemoteViews headsUpContentView;

    field public deprecated android.widget.RemoteViews headsUpContentView;

    field public deprecated int icon;

    field public int iconLevel;

    field public deprecated android.graphics.Bitmap largeIcon;
@@ -5048,14 +5048,22 @@ package android.app { 
    method public android.app.Notification.Builder extend(android.app.Notification.Extender);

    method public android.os.Bundle getExtras();

    method public deprecated android.app.Notification getNotification();

    method public android.widget.RemoteViews makeBigContentView();

    method public android.widget.RemoteViews makeContentView();

    method public android.widget.RemoteViews makeHeadsUpContentView();

    method public static android.app.Notification.Builder recoverBuilder(android.content.Context, android.app.Notification);

    method public android.app.Notification.Builder setActions(android.app.Notification.Action...);

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

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

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

    method public android.app.Notification.Builder setContent(android.widget.RemoteViews);

    method public deprecated android.app.Notification.Builder setContent(android.widget.RemoteViews);

    method public android.app.Notification.Builder setContentInfo(java.lang.CharSequence);

    method public android.app.Notification.Builder setContentIntent(android.app.PendingIntent);

    method public android.app.Notification.Builder setContentText(java.lang.CharSequence);

    method public android.app.Notification.Builder setContentTitle(java.lang.CharSequence);

    method public android.app.Notification.Builder setCustomBigContentView(android.widget.RemoteViews);

    method public android.app.Notification.Builder setCustomContentView(android.widget.RemoteViews);

    method public android.app.Notification.Builder setCustomHeadsUpContentView(android.widget.RemoteViews);

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

    method public android.app.Notification.Builder setDeleteIntent(android.app.PendingIntent);

    method public android.app.Notification.Builder setExtras(android.os.Bundle);