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

Commit 112b11d9 authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

[Notif redesign] Replace notification_content_margin_end 

Replacing the old margin with the general notification_2025_margin used
for most things in the redesign. They have the same 16dp value so this
doesn't actually change anything visually.

Also updated some leftover usages of the old notification_content_margin
in the reply history container.

Bug: 378660052
Test: screenshot tests should be unchanged
Flag: android.app.notifications_redesign_templates
Change-Id: I173a9a8baa480c445009af12884a9dd869cb259c
parent 4fecf780

core/res/res/layout/notification_2025_reply_history_container.xml

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

            android:layout_height="1dip"

            android:id="@+id/action_divider"

            android:layout_marginTop="@dimen/notification_content_margin"

            android:layout_marginBottom="@dimen/notification_content_margin"

            android:layout_marginEnd="@dimen/notification_content_margin_end"

            android:layout_marginTop="@dimen/notification_2025_margin"

            android:layout_marginBottom="@dimen/notification_2025_margin"

            android:layout_marginEnd="@dimen/notification_2025_margin"

            android:background="@drawable/notification_template_divider" />



    <TextView

            android:id="@+id/notification_material_reply_text_3"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginEnd="@dimen/notification_content_margin_end"

            android:layout_marginEnd="@dimen/notification_2025_margin"

            android:visibility="gone"

            android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Reply"

            android:singleLine="true" />
@@ -46,7 +46,7 @@ 
            android:id="@+id/notification_material_reply_text_2"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginEnd="@dimen/notification_content_margin_end"

            android:layout_marginEnd="@dimen/notification_2025_margin"

            android:visibility="gone"

            android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Reply"

            android:singleLine="true" />
@@ -56,13 +56,13 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:layout_marginEnd="@dimen/notification_content_margin_end">

            android:layout_marginEnd="@dimen/notification_2025_margin">

        <TextView

                android:id="@+id/notification_material_reply_text_1"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:layout_marginEnd="@dimen/notification_content_margin_end"

                android:layout_marginEnd="@dimen/notification_2025_margin"

                android:layout_gravity="center"

                android:textAppearance="@style/TextAppearance.DeviceDefault.Notification.Reply"

                android:singleLine="true" />

core/res/res/layout/notification_2025_template_collapsed_base.xml

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ 
            android:id="@+id/expand_button_touch_container"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:minWidth="@dimen/notification_content_margin_end"

            android:minWidth="@dimen/notification_2025_margin"

            >



            <include layout="@layout/notification_2025_expand_button"

core/res/res/layout/notification_2025_template_collapsed_call.xml

+2 −2
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ 
                    android:id="@+id/expand_button_touch_container"

                    android:layout_width="wrap_content"

                    android:layout_height="match_parent"

                    android:minWidth="@dimen/notification_content_margin_end"

                    android:minWidth="@dimen/notification_2025_margin"

                    >



                    <include layout="@layout/notification_2025_expand_button"
@@ -175,7 +175,7 @@ 
            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/notification_2025_smart_reply_container_margin"

            android:layout_marginStart="@dimen/notification_2025_content_margin_start"

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

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

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

    </LinearLayout>

core/res/res/layout/notification_2025_template_collapsed_conversation.xml

+2 −2
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ 
                    android:id="@+id/expand_button_touch_container"

                    android:layout_width="wrap_content"

                    android:layout_height="match_parent"

                    android:minWidth="@dimen/notification_content_margin_end"

                    android:minWidth="@dimen/notification_2025_margin"

                    >



                    <include layout="@layout/notification_2025_expand_button"
@@ -193,7 +193,7 @@ 
            android:layout_height="wrap_content"

            android:layout_marginTop="@dimen/notification_2025_smart_reply_container_margin"

            android:layout_marginStart="@dimen/notification_2025_content_margin_start"

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

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

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



    </LinearLayout>

core/res/res/layout/notification_2025_template_collapsed_media.xml

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ 
            android:id="@+id/expand_button_touch_container"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:minWidth="@dimen/notification_content_margin_end"

            android:minWidth="@dimen/notification_2025_margin"

            >



            <include layout="@layout/notification_2025_expand_button"