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

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

Merge "[Notif redesign] Use layout_weight instad of custom FrameLayout" into main

parents 4c8f42b4 e9bd1580

core/res/res/layout/notification_2025_template_collapsed_call.xml

+3 −2
Original line number Diff line number Diff line
@@ -32,11 +32,12 @@ 
        android:orientation="vertical"

        >



        <com.android.internal.widget.NotificationMaxHeightFrameLayout

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

            >



            <ImageView
@@ -170,7 +171,7 @@ 
                android:layout_height="@dimen/notification_close_button_size"

                android:layout_gravity="top|end" />



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

        </FrameLayout>



        <LinearLayout

            android:id="@+id/notification_action_list_margin_target"

core/res/res/layout/notification_2025_template_collapsed_conversation.xml

+3 −3
Original line number Diff line number Diff line
@@ -32,12 +32,12 @@ 
        android:orientation="vertical"

        >





        <com.android.internal.widget.NotificationMaxHeightFrameLayout

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

            >



            <ImageView
@@ -194,7 +194,7 @@ 
                android:layout_height="@dimen/notification_close_button_size"

                android:layout_gravity="top|end" />



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

        </FrameLayout>



    <LinearLayout

            android:id="@+id/notification_action_list_margin_target"

core/res/res/layout/notification_2025_template_collapsed_messaging.xml

+3 −2
Original line number Diff line number Diff line
@@ -35,11 +35,12 @@ 
        >





        <com.android.internal.widget.NotificationMaxHeightFrameLayout

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

            >



            <ImageView
@@ -204,7 +205,7 @@ 
                android:layout_height="@dimen/notification_close_button_size"

                android:layout_gravity="top|end" />



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

        </FrameLayout>



    <LinearLayout

            android:id="@+id/notification_action_list_margin_target"