From acc9fa838558702a6045b9013e0a9f69ac9a1761 Mon Sep 17 00:00:00 2001
From: Steve Elliott <steell@google.com>
Date: Thu, 30 Apr 2020 12:46:18 -0400
Subject: [PATCH] Fix group conversation bundled -> collapsed animation

Bug: 152770837
Test: manual, visual
Change-Id: I690f297abac387b0585d005ffd9838f3faf3f4dd
---
 .../SystemUI/res/layout/hybrid_conversation_notification.xml   | 3 +--
 .../notification/row/HybridConversationNotificationView.java   | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/res/layout/hybrid_conversation_notification.xml b/packages/SystemUI/res/layout/hybrid_conversation_notification.xml
index e6f27904ee582..21a671cf9d5a2 100644
--- a/packages/SystemUI/res/layout/hybrid_conversation_notification.xml
+++ b/packages/SystemUI/res/layout/hybrid_conversation_notification.xml
@@ -47,14 +47,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:singleLine="true"
-
         android:paddingEnd="8dp"
         android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"
     />
 
     <TextView
         android:id="@+id/conversation_notification_sender"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:singleLine="true"
         style="?attr/hybridNotificationTextStyle"
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/HybridConversationNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/HybridConversationNotificationView.java
index 32477a6f39b7b..9e70f0ac29d57 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/HybridConversationNotificationView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/HybridConversationNotificationView.java
@@ -72,6 +72,7 @@ public class HybridConversationNotificationView extends HybridNotificationView {
         mFacePileProtectionWidth = getResources().getDimensionPixelSize(
                 R.dimen.conversation_single_line_face_pile_protection_width);
         mTransformationHelper.addViewTransformingToSimilar(mConversationIconView);
+        mTransformationHelper.addTransformedView(mConversationSenderName);
     }
 
     @Override