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

Commit 54918257 authored by Ioana Alexandru's avatar Ioana Alexandru Committed by Android (Google) Code Review
Browse files

Merge changes I71085d94,Ic25829bc into main 

* changes:
  [Notif redesign] Increase top margin of expanded messaging content
  [Notif redesign] Consolidate MessagingGroup
parents d9f8adde b60508f4

core/java/com/android/internal/widget/MessagingGroup.java

+5 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ public class MessagingGroup extends NotificationOptimizedLinearLayout implements 
    private MessagingLinearLayout mMessageContainer;

    ImageFloatingTextView mSenderView;

    private ImageView mAvatarView;

    private View mAvatarContainer;

    private String mAvatarSymbol = "";

    private int mLayoutColor;

    private CharSequence mAvatarName = "";
@@ -717,6 +716,11 @@ public class MessagingGroup extends NotificationOptimizedLinearLayout implements 
     * @param isInConversation is this in a conversation

     */

    public void setIsInConversation(boolean isInConversation) {

        if (Flags.notificationsRedesignTemplates()) {

            // No alignment adjustments are necessary in the redesign, as the size of the icons

            // in both conversations and old messaging notifications are the same.

            return;

        }

        if (mIsInConversation != isInConversation) {

            mIsInConversation = isInConversation;

            MarginLayoutParams layoutParams =

core/res/res/layout/notification_2025_messaging_group.xml

+6 −6
Original line number Diff line number Diff line
@@ -24,13 +24,13 @@ 
    android:orientation="horizontal" >

    <FrameLayout

        android:id="@+id/message_icon_container"

        android:layout_width="@dimen/conversation_content_start"

        android:layout_width="@dimen/notification_2025_content_margin_start"

        android:layout_height="wrap_content">

        <ImageView

            android:layout_gravity="top|center_horizontal"

            android:id="@+id/message_icon"

            android:layout_width="@dimen/messaging_avatar_size"

            android:layout_height="@dimen/messaging_avatar_size"

            android:layout_width="@dimen/notification_2025_icon_circle_size"

            android:layout_height="@dimen/notification_2025_icon_circle_size"

            android:background="@drawable/notification_icon_circle"

            android:clipToOutline="true"

            android:scaleType="centerCrop"
@@ -58,14 +58,14 @@ 
    </com.android.internal.widget.RemeasuringLinearLayout>

    <FrameLayout

        android:id="@+id/messaging_group_icon_container"

        android:layout_width="@dimen/messaging_avatar_size"

        android:layout_height="@dimen/messaging_avatar_size"

        android:layout_width="@dimen/notification_2025_icon_circle_size"

        android:layout_height="@dimen/notification_2025_icon_circle_size"

        android:layout_marginStart="12dp"

        android:visibility="gone"/>

    <FrameLayout

        android:id="@+id/messaging_group_sending_progress_container"

        android:layout_width="@dimen/messaging_group_sending_progress_size"

        android:layout_height="@dimen/messaging_avatar_size"

        android:layout_height="@dimen/notification_2025_icon_circle_size"

        android:layout_marginStart="12dp"

        android:layout_gravity="top"

        android:visibility="gone">

core/res/res/layout/notification_2025_template_expanded_messaging.xml

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_gravity="top"

            android:layout_marginTop="@dimen/notification_content_margin_top"

            android:layout_marginTop="@dimen/notification_2025_header_height"

            android:clipChildren="false"

            android:orientation="vertical">