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

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

Merge "Rename onNotificationDirectReply to onNotificationDirectReplied as per... 

Merge "Rename onNotificationDirectReply to onNotificationDirectReplied as per ... the API council feedback."
parents f85b3162 836147ec

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -5430,7 +5430,7 @@ package android.service.notification { 
    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 void onNotificationDirectReplied(java.lang.String);

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

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

    method public void onNotificationExpansionChanged(java.lang.String, boolean, boolean);

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1237,7 +1237,7 @@ package android.service.notification { 
    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 void onNotificationDirectReplied(java.lang.String);

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

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

    method public void onNotificationExpansionChanged(java.lang.String, boolean, boolean);

core/java/android/service/notification/NotificationAssistantService.java

+2 −2
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ public abstract class NotificationAssistantService extends NotificationListenerS 
     * Implement this to know when a direct reply is sent from a notification.

     * @param key the notification key

     */

    public void onNotificationDirectReply(@NonNull String key) {}

    public void onNotificationDirectReplied(@NonNull String key) {}



    /**

     * Implement this to know when a suggested reply is sent.
@@ -407,7 +407,7 @@ public abstract class NotificationAssistantService extends NotificationListenerS 
                    SomeArgs args = (SomeArgs) msg.obj;

                    String key = (String) args.arg1;

                    args.recycle();

                    onNotificationDirectReply(key);

                    onNotificationDirectReplied(key);

                    break;

                }

                case MSG_ON_SUGGESTED_REPLY_SENT: {

packages/ExtServices/src/android/ext/services/notification/Assistant.java

+3 −3
Original line number Diff line number Diff line
@@ -366,9 +366,9 @@ public class Assistant extends NotificationAssistantService { 
    }



    @Override

    public void onNotificationDirectReply(@NonNull String key) {

        if (DEBUG) Log.i(TAG, "onNotificationDirectReply " + key);

        mSmartActionsHelper.onNotificationDirectReply(key);

    public void onNotificationDirectReplied(@NonNull String key) {

        if (DEBUG) Log.i(TAG, "onNotificationDirectReplied " + key);

        mSmartActionsHelper.onNotificationDirectReplied(key);

    }



    @Override

packages/ExtServices/src/android/ext/services/notification/SmartActionsHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ public class SmartActionsHelper { 
        }

    }



    void onNotificationDirectReply(@NonNull String key) {

    void onNotificationDirectReplied(@NonNull String key) {

        if (mTextClassifier == null) {

            return;

        }