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

Commit 3afe48e0 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix existing dismissal surfaces, add one for lockscreen" into... 

Merge "Merge "Fix existing dismissal surfaces, add one for lockscreen" into tm-qpr-dev am: a742754e am: 9f3955cc"
parents 5ce7cbb1 627ab4a1

core/java/android/service/notification/NotificationStats.java

+8 −2
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ public final class NotificationStats implements Parcelable { 


    /** @hide */

    @IntDef(prefix = { "DISMISSAL_SURFACE_" }, value = {

            DISMISSAL_NOT_DISMISSED, DISMISSAL_OTHER, DISMISSAL_PEEK, DISMISSAL_AOD, DISMISSAL_SHADE

            DISMISSAL_NOT_DISMISSED, DISMISSAL_OTHER, DISMISSAL_PEEK, DISMISSAL_AOD,

            DISMISSAL_SHADE, DISMISSAL_BUBBLE, DISMISSAL_LOCKSCREEN

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface DismissalSurface {}
@@ -75,7 +76,12 @@ public final class NotificationStats implements Parcelable { 
     * Notification has been dismissed as a bubble.

     * @hide

     */

    public static final int DISMISSAL_BUBBLE = 3;

    public static final int DISMISSAL_BUBBLE = 4;

    /**

     * Notification has been dismissed from the lock screen.

     * @hide

     */

    public static final int DISMISSAL_LOCKSCREEN = 5;



    /** @hide */

    @IntDef(prefix = { "DISMISS_SENTIMENT_" }, value = {

services/core/java/com/android/server/notification/NotificationRecordLogger.java

+8 −2
Original line number Diff line number Diff line
@@ -177,11 +177,13 @@ public interface NotificationRecordLogger { 
        NOTIFICATION_CANCEL_USER_PEEK(190),

        @UiEvent(doc = "Notification was canceled due to user dismissal from the always-on display")

        NOTIFICATION_CANCEL_USER_AOD(191),

        @UiEvent(doc = "Notification was canceled due to user dismissal from a bubble")

        NOTIFICATION_CANCEL_USER_BUBBLE(1228),

        @UiEvent(doc = "Notification was canceled due to user dismissal from the lockscreen")

        NOTIFICATION_CANCEL_USER_LOCKSCREEN(193),

        @UiEvent(doc = "Notification was canceled due to user dismissal from the notification"

                + " shade.")

        NOTIFICATION_CANCEL_USER_SHADE(192),

        @UiEvent(doc = "Notification was canceled due to user dismissal from the lockscreen")

        NOTIFICATION_CANCEL_USER_LOCKSCREEN(193),

        @UiEvent(doc = "Notification was canceled due to an assistant adjustment update.")

        NOTIFICATION_CANCEL_ASSISTANT(906);
@@ -232,6 +234,10 @@ public interface NotificationRecordLogger { 
                    return NOTIFICATION_CANCEL_USER_AOD;

                case NotificationStats.DISMISSAL_SHADE:

                    return NOTIFICATION_CANCEL_USER_SHADE;

                case NotificationStats.DISMISSAL_BUBBLE:

                    return NOTIFICATION_CANCEL_USER_BUBBLE;

                case NotificationStats.DISMISSAL_LOCKSCREEN:

                    return NOTIFICATION_CANCEL_USER_LOCKSCREEN;

                default:

                    if (NotificationManagerService.DBG) {

                        throw new IllegalArgumentException("Unexpected surface for user-dismiss "