Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Fix existing dismissal surfaces, add one for lockscreen" into tm-qpr-dev am: a742754e6e am: 9f3955ccfd"

Browse Source
This commit is contained in:
Automerger Merge Worker
2022-10-11 16:08:56 +00:00
committed by Android (Google) Code Review
parent 5ce7cbb113 627ab4a106
commit 3afe48e008
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/service/notification/NotificationStats.java
View File

@@ -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 = {

10
services/core/java/com/android/server/notification/NotificationRecordLogger.java
View File

@@ -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 "