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

Change-Id: Ia0e8acefef96a75ecfe203e264b96a57ef4f2f02
This commit is contained in:
Steve Elliott
2020-04-30 20:49:22 +00:00
committed by Automerger Merge Worker
2 changed files with 2 additions and 2 deletions

View File

@@ -47,14 +47,13 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:paddingEnd="8dp" android:paddingEnd="8dp"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title" android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"
/> />
<TextView <TextView
android:id="@+id/conversation_notification_sender" android:id="@+id/conversation_notification_sender"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
style="?attr/hybridNotificationTextStyle" style="?attr/hybridNotificationTextStyle"

View File

@@ -72,6 +72,7 @@ public class HybridConversationNotificationView extends HybridNotificationView {
mFacePileProtectionWidth = getResources().getDimensionPixelSize( mFacePileProtectionWidth = getResources().getDimensionPixelSize(
R.dimen.conversation_single_line_face_pile_protection_width); R.dimen.conversation_single_line_face_pile_protection_width);
mTransformationHelper.addViewTransformingToSimilar(mConversationIconView); mTransformationHelper.addViewTransformingToSimilar(mConversationIconView);
mTransformationHelper.addTransformedView(mConversationSenderName);
} }
@Override @Override