Merge "Fix group conversation bundled -> collapsed animation" into rvc-dev am: eaee42c4c7 am: 3319d205f5

Change-Id: Ia0e8acefef96a75ecfe203e264b96a57ef4f2f02

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"

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