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

Commit 4fecf780 authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

[Notif redesign] Remove negative margin layout from convo/call HUNs 

Negative margins are generally not recommended, and if we tweak the
margins of the other children here a little bit we can align the actions
just fine without needing a negative margin.

Bug: 378660052
Test: manual + screenshot tests
Flag: android.app.notifications_redesign_templates
Change-Id: I58f2cf80eed5c9ce28320134acc8e834cce55684
parent f4cedb7e

core/res/res/layout/notification_2025_conversation_icon_container.xml

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ 
    <FrameLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_margin="@dimen/notification_2025_margin"

        android:layout_marginHorizontal="@dimen/notification_2025_margin"

        android:layout_marginTop="@dimen/notification_2025_margin"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:layout_gravity="top|center_horizontal"

core/res/res/layout/notification_2025_template_collapsed_call.xml

+5 −14
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
        <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:minHeight="@dimen/notification_2025_min_height"

            android:clipChildren="false"

            android:layout_weight="1"

            >
@@ -79,7 +78,6 @@ 
                    android:layout_width="0px"

                    android:layout_height="wrap_content"

                    android:layout_weight="1"

                    android:layout_marginBottom="@dimen/notification_2025_margin"

                    android:layout_marginTop="@dimen/notification_2025_margin"

                    android:clipChildren="false"

                    android:orientation="vertical"
@@ -172,12 +170,6 @@ 


        </FrameLayout>



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="-20dp"

            android:clipChildren="false"

            android:orientation="vertical">

        <include layout="@layout/notification_template_smart_reply_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"
@@ -186,6 +178,5 @@ 
            android:layout_marginEnd="@dimen/notification_content_margin_end" />

        <include layout="@layout/notification_2025_action_list" />

    </LinearLayout>

    </LinearLayout>



</com.android.internal.widget.CallLayout>

core/res/res/layout/notification_2025_template_collapsed_conversation.xml

+6 −13
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
        <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:minHeight="@dimen/notification_2025_min_height"

            android:clipChildren="false"

            android:layout_weight="1"

            >
@@ -79,6 +78,7 @@ 
                >



                <LinearLayout

                    android:id="@+id/notification_headerless_view_column"

                    android:layout_width="0px"

                    android:layout_height="wrap_content"

                    android:layout_weight="1"
@@ -188,12 +188,6 @@ 


        </FrameLayout>



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="-20dp"

            android:clipChildren="false"

            android:orientation="vertical">

        <include layout="@layout/notification_template_smart_reply_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"
@@ -201,7 +195,6 @@ 
            android:layout_marginStart="@dimen/notification_2025_content_margin_start"

            android:layout_marginEnd="@dimen/notification_content_margin_end" />

        <include layout="@layout/notification_2025_action_list" />

        </LinearLayout>



    </LinearLayout>

</com.android.internal.widget.ConversationLayout>

core/res/res/layout/notification_2025_template_collapsed_messaging.xml

+8 −14
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
        <FrameLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:minHeight="@dimen/notification_2025_min_height"

            android:clipChildren="false"

            android:layout_weight="1"

            >
@@ -61,7 +60,8 @@ 
                android:layout_width="@dimen/notification_2025_icon_circle_size"

                android:layout_height="@dimen/notification_2025_icon_circle_size"

                android:layout_alignParentStart="true"

                android:layout_margin="@dimen/notification_2025_margin"

                android:layout_marginHorizontal="@dimen/notification_2025_margin"

                android:layout_marginTop="@dimen/notification_2025_margin"

                android:background="@drawable/notification_icon_circle"

                android:padding="@dimen/notification_2025_icon_circle_padding"

                />
@@ -90,6 +90,7 @@ 
                >



                <LinearLayout

                    android:id="@+id/notification_headerless_view_column"

                    android:layout_width="0px"

                    android:layout_height="wrap_content"

                    android:layout_weight="1"
@@ -199,12 +200,6 @@ 


        </FrameLayout>



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="-20dp"

            android:clipChildren="false"

            android:orientation="vertical">

        <include layout="@layout/notification_template_smart_reply_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"
@@ -212,7 +207,6 @@ 
            android:layout_marginStart="@dimen/notification_2025_content_margin_start"

            android:layout_marginEnd="@dimen/notification_content_margin_end" />

        <include layout="@layout/notification_2025_action_list" />

        </LinearLayout>



    </LinearLayout>

</com.android.internal.widget.MessagingLayout>