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

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

Merge changes I173c7656,I5570c080 into main 

* changes:
  [Notif redesign] Adjust margins of "small" icon
  [Notif redesign] Make group header respect header height
parents 0bea3271 9a89a0f1

core/res/res/layout/notification_2025_template_collapsed_base.xml

+4 −4
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ 
        android:id="@+id/left_icon"

        android:layout_width="@dimen/notification_2025_left_icon_size"

        android:layout_height="@dimen/notification_2025_left_icon_size"

        android:layout_gravity="center_vertical|start"

        android:layout_marginStart="@dimen/notification_left_icon_start"

        android:layout_alignParentStart="true"

        android:layout_margin="@dimen/notification_2025_margin"

        android:background="@drawable/notification_large_icon_outline"

        android:clipToOutline="true"

        android:importantForAccessibility="no"
@@ -41,8 +41,8 @@ 
        android:id="@+id/icon"

        android:layout_width="@dimen/notification_2025_icon_circle_size"

        android:layout_height="@dimen/notification_2025_icon_circle_size"

        android:layout_gravity="center_vertical|start"

        android:layout_marginStart="@dimen/notification_icon_circle_start"

        android:layout_alignParentStart="true"

        android:layout_margin="@dimen/notification_2025_margin"

        android:background="@drawable/notification_icon_circle"

        android:padding="@dimen/notification_2025_icon_circle_padding"

        android:maxDrawableWidth="@dimen/notification_2025_icon_circle_size"

core/res/res/layout/notification_2025_template_collapsed_media.xml

+4 −4
Original line number Diff line number Diff line
@@ -32,8 +32,8 @@ 
        android:id="@+id/left_icon"

        android:layout_width="@dimen/notification_2025_left_icon_size"

        android:layout_height="@dimen/notification_2025_left_icon_size"

        android:layout_gravity="center_vertical|start"

        android:layout_marginStart="@dimen/notification_left_icon_start"

        android:layout_alignParentStart="true"

        android:layout_margin="@dimen/notification_2025_margin"

        android:background="@drawable/notification_large_icon_outline"

        android:clipToOutline="true"

        android:importantForAccessibility="no"
@@ -45,8 +45,8 @@ 
        android:id="@+id/icon"

        android:layout_width="@dimen/notification_2025_icon_circle_size"

        android:layout_height="@dimen/notification_2025_icon_circle_size"

        android:layout_gravity="center_vertical|start"

        android:layout_marginStart="@dimen/notification_icon_circle_start"

        android:layout_alignParentStart="true"

        android:layout_margin="@dimen/notification_2025_margin"

        android:background="@drawable/notification_icon_circle"

        android:padding="@dimen/notification_2025_icon_circle_padding"

        />

core/res/res/layout/notification_2025_template_collapsed_messaging.xml

+4 −4
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ 
                android:id="@+id/left_icon"

                android:layout_width="@dimen/notification_2025_left_icon_size"

                android:layout_height="@dimen/notification_2025_left_icon_size"

                android:layout_gravity="center_vertical|start"

                android:layout_marginStart="@dimen/notification_left_icon_start"

                android:layout_alignParentStart="true"

                android:layout_margin="@dimen/notification_2025_margin"

                android:background="@drawable/notification_large_icon_outline"

                android:clipToOutline="true"

                android:importantForAccessibility="no"
@@ -59,8 +59,8 @@ 
                android:id="@+id/icon"

                android:layout_width="@dimen/notification_2025_icon_circle_size"

                android:layout_height="@dimen/notification_2025_icon_circle_size"

                android:layout_gravity="center_vertical|start"

                android:layout_marginStart="@dimen/notification_icon_circle_start"

                android:layout_alignParentStart="true"

                android:layout_margin="@dimen/notification_2025_margin"

                android:background="@drawable/notification_icon_circle"

                android:padding="@dimen/notification_2025_icon_circle_padding"

                />

core/res/res/layout/notification_2025_template_header.xml

+2 −4
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ 
        android:layout_width="@dimen/notification_2025_left_icon_size"

        android:layout_height="@dimen/notification_2025_left_icon_size"

        android:layout_alignParentStart="true"

        android:layout_centerVertical="true"

        android:layout_marginStart="@dimen/notification_left_icon_start"

        android:layout_margin="@dimen/notification_2025_margin"

        android:background="@drawable/notification_large_icon_outline"

        android:clipToOutline="true"

        android:importantForAccessibility="no"
@@ -47,8 +46,7 @@ 
        android:layout_width="@dimen/notification_2025_icon_circle_size"

        android:layout_height="@dimen/notification_2025_icon_circle_size"

        android:layout_alignParentStart="true"

        android:layout_centerVertical="true"

        android:layout_marginStart="@dimen/notification_icon_circle_start"

        android:layout_margin="@dimen/notification_2025_margin"

        android:background="@drawable/notification_icon_circle"

        android:padding="@dimen/notification_2025_icon_circle_padding"

        android:maxDrawableWidth="@dimen/notification_2025_icon_circle_size"

packages/SystemUI/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -236,6 +236,9 @@ 
    <!-- The size of a bluetooth indicator icon that displays next to the RSSI status icon. -->

    <dimen name="status_bar_connected_device_bt_indicator_size">17dp</dimen>



    <!-- Height of a small notification in the status bar (2025 redesign version) -->

    <dimen name="notification_2025_header_height">@*android:dimen/notification_2025_header_height</dimen>



    <!-- Height of a small notification in the status bar (2025 redesign version) -->

    <dimen name="notification_2025_min_height">@*android:dimen/notification_2025_min_height</dimen>