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

Commit 317d0c98 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Send Snooze callback for Assistant"

parents 6f773a0d 7967230d

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -35466,6 +35466,7 @@ package android.service.notification { 
    method public java.util.List<android.app.NotificationChannel> getNotificationChannels(java.lang.String);

    method public final android.os.IBinder onBind(android.content.Intent);

    method public abstract android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean);

    method public abstract void onNotificationSnoozedUntilContext(android.service.notification.StatusBarNotification, java.lang.String);

    method public void updateNotificationChannel(java.lang.String, android.app.NotificationChannel);

    field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.NotificationAssistantService";

  }
@@ -35497,6 +35498,7 @@ package android.service.notification { 
    method public static void requestRebind(android.content.ComponentName);

    method public final void requestUnbind();

    method public final void setNotificationsShown(java.lang.String[]);

    method public final void snoozeNotification(java.lang.String, java.lang.String);

    method public final void snoozeNotification(java.lang.String, long);

    method public final void snoozeNotification(java.lang.String);

    method public final void unsnoozeNotification(java.lang.String);

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -38335,6 +38335,7 @@ package android.service.notification { 
    method public java.util.List<android.app.NotificationChannel> getNotificationChannels(java.lang.String);

    method public final android.os.IBinder onBind(android.content.Intent);

    method public abstract android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean);

    method public abstract void onNotificationSnoozedUntilContext(android.service.notification.StatusBarNotification, java.lang.String);

    method public void updateNotificationChannel(java.lang.String, android.app.NotificationChannel);

    field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.NotificationAssistantService";

  }
@@ -38370,6 +38371,7 @@ package android.service.notification { 
    method public final void requestUnbind();

    method public final void setNotificationsShown(java.lang.String[]);

    method public final void setOnNotificationPostedTrim(int);

    method public final void snoozeNotification(java.lang.String, java.lang.String);

    method public final void snoozeNotification(java.lang.String, long);

    method public final void snoozeNotification(java.lang.String);

    method public void unregisterAsSystemService() throws android.os.RemoteException;

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -35584,6 +35584,7 @@ package android.service.notification { 
    method public java.util.List<android.app.NotificationChannel> getNotificationChannels(java.lang.String);

    method public final android.os.IBinder onBind(android.content.Intent);

    method public abstract android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification, int, boolean);

    method public abstract void onNotificationSnoozedUntilContext(android.service.notification.StatusBarNotification, java.lang.String);

    method public void updateNotificationChannel(java.lang.String, android.app.NotificationChannel);

    field public static final java.lang.String SERVICE_INTERFACE = "android.service.notification.NotificationAssistantService";

  }
@@ -35615,6 +35616,7 @@ package android.service.notification { 
    method public static void requestRebind(android.content.ComponentName);

    method public final void requestUnbind();

    method public final void setNotificationsShown(java.lang.String[]);

    method public final void snoozeNotification(java.lang.String, java.lang.String);

    method public final void snoozeNotification(java.lang.String, long);

    method public final void snoozeNotification(java.lang.String);

    method public final void unsnoozeNotification(java.lang.String);

core/java/android/app/INotificationManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ interface INotificationManager 
    void cancelNotificationFromListener(in INotificationListener token, String pkg, String tag, int id);

    void cancelNotificationsFromListener(in INotificationListener token, in String[] keys);





    void snoozeNotificationUntilContextFromListener(in INotificationListener token, String key, String snoozeCriterionId);

    void snoozeNotificationUntilFromListener(in INotificationListener token, String key, long until);

    void snoozeNotificationFromListener(in INotificationListener token, String key);

    void unsnoozeNotificationFromListener(in INotificationListener token, String key);

core/java/android/service/notification/Adjustment.java

+4 −1
Original line number Diff line number Diff line
@@ -41,7 +41,10 @@ public final class Adjustment implements Parcelable { 
     */

    public static final String KEY_PEOPLE = "key_people";

    /**

     * Parcelable {@code ArrayList} of {@link SnoozeCriterion}.

     * Parcelable {@code ArrayList} of {@link SnoozeCriterion}. These criteria may be visible to

     * users. If a user chooses to snooze a notification until one of these criterion, the

     * assistant will be notified via

     * {@link NotificationAssistantService#onNotificationSnoozedUntilContext}.

     */

    public static final String KEY_SNOOZE_CRITERIA = "key_snooze_criteria";