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

Merge "Do not increment the conversation unread count when FLAG_ONLY_ALERT_ONCE is set." into sc-dev

Browse Source
This commit is contained in:
Jeff DeCew
2021-03-10 17:31:15 +00:00
committed by Android (Google) Code Review
parent 4e57531ea5 5c64d007e8
commit 34555e2081
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/SystemUI/src/com/android/systemui/statusbar/notification/ConversationNotifications.kt
View File

@@ -218,13 +218,18 @@ class ConversationNotificationManager @Inject constructor(
})
}
private fun ConversationState.shouldIncrementUnread(newBuilder: Notification.Builder) =
if (notification.flags and Notification.FLAG_ONLY_ALERT_ONCE != 0) {
false
} else {
val oldBuilder = Notification.Builder.recoverBuilder(context, notification)
Notification.areStyledNotificationsVisiblyDifferent(oldBuilder, newBuilder)
}
fun getUnreadCount(entry: NotificationEntry, recoveredBuilder: Notification.Builder): Int =
states.compute(entry.key) { _, state ->
val newCount = state?.run {
val old = Notification.Builder.recoverBuilder(context, notification)
val increment = Notification
.areStyledNotificationsVisiblyDifferent(old, recoveredBuilder)
if (increment) unreadCount + 1 else unreadCount
if (shouldIncrementUnread(recoveredBuilder)) unreadCount + 1 else unreadCount
} ?: 1
ConversationState(newCount, entry.sbn.notification)
}!!.unreadCount