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

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

Merge changes from topic "remove_negative_margin_huns" into main 

* changes:
  [Notif redesign] Replace notification_content_margin_end
  [Notif redesign] Remove negative margin layout from convo/call HUNs
parents 8a64bdaa 112b11d9

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_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

+6 −15
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"
@@ -151,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"
@@ -172,20 +170,13 @@ 


        </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"

            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>

    </LinearLayout>



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

core/res/res/layout/notification_2025_template_collapsed_conversation.xml

+7 −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,6 +78,7 @@ 
                >



                <LinearLayout

                    android:id="@+id/notification_headerless_view_column"

                    android:layout_width="0px"

                    android:layout_height="wrap_content"

                    android:layout_weight="1"
@@ -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"
@@ -188,20 +188,13 @@ 


        </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"

            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>



    </LinearLayout>

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