summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationConversationTemplateViewWrapperTest.kt11
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationConversationTemplateViewWrapper.kt3
2 files changed, 8 insertions, 6 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationConversationTemplateViewWrapperTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationConversationTemplateViewWrapperTest.kt
index 081f52c4ff3b..bf6ee9253418 100644
--- a/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationConversationTemplateViewWrapperTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationConversationTemplateViewWrapperTest.kt
@@ -75,9 +75,10 @@ class NotificationConversationTemplateViewWrapperTest : SysuiTestCase() {
// Creates a mocked out NotificationEntry of ConversationLayout type,
// with a mock imageMessage.drawable embedded in its MessagingImageMessages
// (both top level, and in a group).
- val mockDrawable = mock<AnimatedImageDrawable>()
- val mockDrawable2 = mock<AnimatedImageDrawable>()
- val mockLayoutView: View = fakeConversationLayout(mockDrawable, mockDrawable2)
+ val mockDrawableGroupMessage = mock<AnimatedImageDrawable>()
+ val mockDrawableImageMessage = mock<AnimatedImageDrawable>()
+ val mockLayoutView: View =
+ fakeConversationLayout(mockDrawableGroupMessage, mockDrawableImageMessage)
val wrapper: NotificationViewWrapper =
NotificationConversationTemplateViewWrapper(mContext, mockLayoutView, mRow)
@@ -85,8 +86,8 @@ class NotificationConversationTemplateViewWrapperTest : SysuiTestCase() {
wrapper.setAnimationsRunning(false)
// Verifies that each AnimatedImageDrawable is started animating.
- verify(mockDrawable).stop()
- verify(mockDrawable2).stop()
+ verify(mockDrawableGroupMessage).stop()
+ verify(mockDrawableImageMessage).stop()
}
private fun fakeConversationLayout(
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationConversationTemplateViewWrapper.kt b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationConversationTemplateViewWrapper.kt
index 6a96fba8f28d..3d5f9e4cafdd 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationConversationTemplateViewWrapper.kt
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/wrapper/NotificationConversationTemplateViewWrapper.kt
@@ -174,7 +174,8 @@ class NotificationConversationTemplateViewWrapper(
// and the top level image message container.
val containers =
messageContainers.asSequence().map { it.messageContainer } +
- if (notificationsRedesignTemplates()) emptySequence()
+ if (notificationsRedesignTemplates() && imageMessageContainer == null)
+ emptySequence()
else sequenceOf(imageMessageContainer!!)
val drawables =
containers