Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35e6b77e authored by Steve Elliott's avatar Steve Elliott Committed by Automerger Merge Worker
Browse files

Merge "Fix group conversation bundled -> collapsed animation" into rvc-dev am:... 

Merge "Fix group conversation bundled -> collapsed animation" into rvc-dev am: eaee42c4 am: 3319d205 am: 14f51764

Change-Id: I87f48ad3bf008f4139d2996637ef40086fd2fba5
parents 4c5f0502 14f51764

packages/SystemUI/res/layout/hybrid_conversation_notification.xml

+1 −2
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -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