| commit | cb9568c63b775c52605f99382c7f17ade075d0f0 | [log] [tgz] |
|---|---|---|
| author | Yuri Lin <yurilin@google.com> | Wed Oct 12 18:57:03 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 12 18:57:03 2022 +0000 |
| tree | 256a76d286a24fca245a66f9d194967b4a98b6c2 | |
| parent | d43602bbdd098862d6f088b9e0b38b6feecc70a8 [diff] | |
| parent | 84b8833d3f6c2ee6cdbc18306dbe71cbc0874444 [diff] |
Merge "Detect dismissals on the lockscreen surface" into tm-qpr-dev am: c47fd5ddad am: 84b8833d3f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20152731 Change-Id: I313b7c052ccf9b81949a2607a791a0f5a33ab4d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/OnUserInteractionCallbackImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/OnUserInteractionCallbackImpl.java index a7719d3..e71d80c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/OnUserInteractionCallbackImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/inflation/OnUserInteractionCallbackImpl.java
@@ -18,6 +18,8 @@ import static android.service.notification.NotificationStats.DISMISS_SENTIMENT_NEUTRAL; +import static com.android.systemui.statusbar.StatusBarState.KEYGUARD; + import android.os.SystemClock; import android.service.notification.NotificationStats; @@ -70,6 +72,8 @@ dismissalSurface = NotificationStats.DISMISSAL_PEEK; } else if (mStatusBarStateController.isDozing()) { dismissalSurface = NotificationStats.DISMISSAL_AOD; + } else if (mStatusBarStateController.getState() == KEYGUARD) { + dismissalSurface = NotificationStats.DISMISSAL_LOCKSCREEN; } return new DismissedByUserStats( dismissalSurface,