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

Commit 05f5a2d7 authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

Reduce notif expander padding by 1dp 

This gives us an additional 2dp of space between the expander and the
content text, without altering the visual aspect too much.

This change updates the paddings in:
- the standard notification expander (the dimen are used in
  notification_2025_expand_button.xml)
- the compose bundle expander
- the expander from the WIP implementation of notifs in compose

Fix: 434019277
Test: manual + screenshot tests
Flag: EXEMPT minor visual tweak
Change-Id: I741c6b1b6311fa6668a5819fb370dcaaa4568e0a
parent 71331759

core/res/res/values/dimens.xml

+5 −5
Original line number Diff line number Diff line
@@ -441,10 +441,10 @@ 
    <dimen name="notification_expand_button_pill_height">24dp</dimen>



    <!-- the height of the expand button pill (2025 redesign version) -->

    <dimen name="notification_2025_expand_button_pill_height">20dp</dimen>

    <dimen name="notification_2025_expand_button_pill_height">18dp</dimen>



    <!-- the width of the expand button pill (2025 redesign version) -->

    <dimen name="notification_2025_expand_button_pill_width">28dp</dimen>

    <dimen name="notification_2025_expand_button_pill_width">26dp</dimen>



    <!-- the size of the expand arrow (2025 redesign version) -->

    <dimen name="notification_2025_expand_button_icon_size">16sp</dimen>
@@ -453,13 +453,13 @@ 
    <dimen name="notification_expand_button_icon_padding">2dp</dimen>



    <!-- the padding of the expand icon in the notification header -->

    <dimen name="notification_2025_expand_button_vertical_icon_padding">2dp</dimen>

    <dimen name="notification_2025_expand_button_vertical_icon_padding">1dp</dimen>



    <!-- the padding of the expand icon in the notification header -->

    <dimen name="notification_2025_expand_button_horizontal_icon_padding">6dp</dimen>

    <dimen name="notification_2025_expand_button_horizontal_icon_padding">5dp</dimen>



    <!-- smaller padding for the end of the expand icon, for use when showing the number -->

    <dimen name="notification_2025_expand_button_reduced_end_padding">4dp</dimen>

    <dimen name="notification_2025_expand_button_reduced_end_padding">3dp</dimen>



    <!-- the space needed between the expander pill and the large icon when visible -->

    <dimen name="notification_2025_expand_button_right_icon_spacing">8dp</dimen>

packages/SystemUI/compose/features/src/com/android/systemui/notifications/ui/composable/row/NotificationRowPrimitives.kt

+4 −4
Original line number Diff line number Diff line
@@ -110,10 +110,10 @@ fun ContentScope.ExpansionControl( 
            verticalAlignment = Alignment.CenterVertically,

            modifier =

                Modifier.padding(

                    top = 2.dp,

                    bottom = 2.dp,

                    start = 6.dp,

                    end = if (shouldShowNumber) 4.dp else 6.dp,

                    top = 1.dp,

                    bottom = 1.dp,

                    start = 5.dp,

                    end = if (shouldShowNumber) 3.dp else 5.dp,

                ),

        ) {

            val iconSizeDp = with(LocalDensity.current) { 16.sp.toDp() }

packages/SystemUI/pods/src/com/android/systemui/notifications/ui/composable/component/Expander.kt

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ internal fun Expander(expanded: Boolean, modifier: Modifier = Modifier, numberTo 
    Box(modifier = modifier.background(surfaceColor, RoundedCornerShape(100.dp))) {

        Row(

            verticalAlignment = Alignment.CenterVertically,

            modifier = Modifier.padding(vertical = 2.dp, horizontal = 6.dp),

            modifier = Modifier.padding(vertical = 1.dp, horizontal = 5.dp),

        ) {

            val iconSizeDp = with(LocalDensity.current) { 16.sp.toDp() }