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

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

Merge "Add onActionClicked in NotificationAssistantService"

parents f4f922b1 7d4b3a5f

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -5100,6 +5100,7 @@ package android.service.notification { 
    ctor public NotificationAssistantService();

    method public final void adjustNotification(android.service.notification.Adjustment);

    method public final void adjustNotifications(java.util.List<android.service.notification.Adjustment>);

    method public void onActionClicked(java.lang.String, android.app.Notification.Action, int);

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

    method public void onNotificationDirectReply(java.lang.String);

    method public android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification);

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1159,6 +1159,7 @@ package android.service.notification { 
    ctor public NotificationAssistantService();

    method public final void adjustNotification(android.service.notification.Adjustment);

    method public final void adjustNotifications(java.util.List<android.service.notification.Adjustment>);

    method public void onActionClicked(java.lang.String, android.app.Notification.Action, int);

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

    method public void onNotificationDirectReply(java.lang.String);

    method public android.service.notification.Adjustment onNotificationEnqueued(android.service.notification.StatusBarNotification);

core/java/android/app/Notification.aidl

+1 −0
Original line number Diff line number Diff line
@@ -17,3 +17,4 @@ 
package android.app;



parcelable Notification;

parcelable Notification.Action;
 
 No newline at end of file

core/java/android/app/Notification.java

+2 −0
Original line number Diff line number Diff line
@@ -5448,6 +5448,8 @@ public class Notification implements Parcelable 
                            p.ambient ? resolveAmbientColor(p) : resolveContrastColor(p));

                }

            }

            button.setIntTag(R.id.action0, R.id.notification_action_index_tag,

                    mActions.indexOf(action));

            return button;

        }

core/java/android/service/notification/INotificationListener.aidl

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.service.notification;



import android.app.Notification;

import android.app.NotificationChannel;

import android.app.NotificationChannelGroup;

import android.content.pm.ParceledListSlice;
@@ -50,4 +51,5 @@ oneway interface INotificationListener 
    void onNotificationExpansionChanged(String key, boolean userAction, boolean expanded);

    void onNotificationDirectReply(String key);

    void onSuggestedReplySent(String key, in CharSequence reply, int source);

    void onActionClicked(String key, in Notification.Action action, int source);

}