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

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

Merge "Add updatable fields to Ranking"

parents 425a129f 924eed1c

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -35788,6 +35788,7 @@ package android.service.notification { 














  public static class NotificationListenerService.Ranking {















    ctor public NotificationListenerService.Ranking();













    method public boolean canShowBadge();















    method public java.util.List<java.lang.String> getAdditionalPeople();















    method public android.app.NotificationChannel getChannel();















    method public int getImportance();










@@ -35829,7 +35830,6 @@ package android.service.notification {













    method public int getId();















    method public java.lang.String getKey();















    method public android.app.Notification getNotification();













    method public android.app.NotificationChannel getNotificationChannel();















    method public java.lang.String getOverrideGroupKey();















    method public java.lang.String getPackageName();















    method public long getPostTime();

























api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -38733,6 +38733,7 @@ package android.service.notification {



























  public static class NotificationListenerService.Ranking {















    ctor public NotificationListenerService.Ranking();













    method public boolean canShowBadge();















    method public java.util.List<java.lang.String> getAdditionalPeople();















    method public android.app.NotificationChannel getChannel();















    method public int getImportance();










@@ -38774,7 +38775,6 @@ package android.service.notification {













    method public int getId();















    method public java.lang.String getKey();















    method public android.app.Notification getNotification();













    method public android.app.NotificationChannel getNotificationChannel();















    method public java.lang.String getOverrideGroupKey();















    method public java.lang.String getPackageName();















    method public long getPostTime();

























api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -35909,6 +35909,7 @@ package android.service.notification {



























  public static class NotificationListenerService.Ranking {















    ctor public NotificationListenerService.Ranking();













    method public boolean canShowBadge();















    method public java.util.List<java.lang.String> getAdditionalPeople();















    method public android.app.NotificationChannel getChannel();















    method public int getImportance();










@@ -35950,7 +35951,6 @@ package android.service.notification {













    method public int getId();















    method public java.lang.String getKey();















    method public android.app.Notification getNotification();













    method public android.app.NotificationChannel getNotificationChannel();















    method public java.lang.String getOverrideGroupKey();















    method public java.lang.String getPackageName();















    method public long getPostTime();

























core/java/android/app/INotificationManager.aidl



+2
−0




























Original line number
Diff line number
Diff line








@@ -47,6 +47,8 @@ interface INotificationManager













            in Notification notification, inout int[] idReceived, int userId);















    void cancelNotificationWithTag(String pkg, String tag, int id, int userId);





























    void setShowBadge(String pkg, int uid, boolean showBadge);













    boolean canShowBadge(String pkg, int uid);















    void setNotificationsEnabledForPackage(String pkg, int uid, boolean enabled);















    boolean areNotificationsEnabledForPackage(String pkg, int uid);















    boolean areNotificationsEnabled(String pkg);

































core/java/android/app/NotificationChannel.java



+4
−1




























Original line number
Diff line number
Diff line








@@ -122,6 +122,7 @@ public final class NotificationChannel implements Parcelable {













    private static final int DEFAULT_IMPORTANCE =















            NotificationManager.IMPORTANCE_UNSPECIFIED;















    private static final boolean DEFAULT_DELETED = false;













    private static final boolean DEFAULT_SHOW_BADGE = true;































    private final String mId;















    private CharSequence mName;









@@ -133,7 +134,7 @@ public final class NotificationChannel implements Parcelable {













    private long[] mVibration;















    private int mUserLockedFields;















    private boolean mVibrationEnabled;













    private boolean mShowBadge;













    private boolean mShowBadge = DEFAULT_SHOW_BADGE;















    private boolean mDeleted = DEFAULT_DELETED;































    /**










@@ -368,6 +369,8 @@ public final class NotificationChannel implements Parcelable {













    /**















     * Returns whether notifications posted to this channel can appear as badges in a Launcher















     * application.













     *













     * Note that badging may be disabled for other reasons.















     */















    public boolean canShowBadge() {















        return mShowBadge;