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

Commit da92c4d7 authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

Update spacing and alignment of smart action buttons 

This ensures that the buttons are up to spec:
- icons are 20x20dp
- inner vertical padding is 8dp
- inner horizontal padding is 12dp
- text is left-aligned when two-line

It affects all types of related chips: smart actions, smart replies,
animated actions and animated replies.

Fix: 427242450
Test: screenshot tests + manual
Flag: android.app.notifications_redesign_templates
Flag: com.android.systemui.notification_animated_actions_treatment
Change-Id: I132c2805eeb2513be0ea247fcb105d00828c7848
parent f0c40072

packages/SystemUI/res/layout/animated_action_button.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
    android:drawablePadding="@dimen/animated_action_button_drawable_padding"

    android:ellipsize="end"

    android:textAppearance="@style/TextAppearance.NotificationSmartReply"

    android:gravity="center"

    android:gravity="left|center_vertical"

    android:minWidth="0dp"

    android:minHeight="@dimen/animated_action_button_touch_target_height"

    android:paddingHorizontal="@dimen/animated_action_button_padding_horizontal"

packages/SystemUI/res/layout/notification_2025_smart_action_button.xml

+3 −4
Original line number Diff line number Diff line
@@ -22,12 +22,11 @@ 
        android:layout_height="match_parent"

        android:minWidth="0dp"

        android:minHeight="@dimen/notification_2025_smart_reply_button_min_height"

        android:paddingVertical="@dimen/smart_reply_button_padding_vertical"

        android:paddingVertical="@dimen/notification_2025_smart_reply_button_padding_vertical"

        android:background="@drawable/notification_2025_smart_reply_button_background"

        android:gravity="center"

        android:gravity="left|center_vertical"

        android:textAppearance="@style/TextAppearance.NotificationSmartReply"

        android:paddingStart="@dimen/smart_reply_button_action_padding_left"

        android:paddingEnd="@dimen/smart_reply_button_padding_horizontal"

        android:paddingHorizontal="@dimen/notification_2025_smart_reply_button_padding_horizontal"

        android:drawablePadding="@dimen/smart_action_button_icon_padding"

        android:textStyle="normal"

        android:ellipsize="none"/>

packages/SystemUI/res/layout/notification_2025_smart_reply_button.xml

+3 −4
Original line number Diff line number Diff line
@@ -24,11 +24,10 @@ 
        android:layout_height="match_parent"

        android:minWidth="0dp"

        android:minHeight="@dimen/notification_2025_smart_reply_button_min_height"

        android:paddingVertical="@dimen/smart_reply_button_padding_vertical"

        android:paddingVertical="@dimen/notification_2025_smart_reply_button_padding_vertical"

        android:background="@drawable/notification_2025_smart_reply_button_background"

        android:gravity="center"

        android:gravity="left|center_vertical"

        android:textAppearance="@style/TextAppearance.NotificationSmartReply"

        android:paddingStart="@dimen/smart_reply_button_padding_horizontal"

        android:paddingEnd="@dimen/smart_reply_button_padding_horizontal"

        android:paddingHorizontal="@dimen/notification_2025_smart_reply_button_padding_horizontal"

        android:textStyle="normal"

        android:ellipsize="none"/>

packages/SystemUI/res/values/dimens.xml

+8 −1
Original line number Diff line number Diff line
@@ -1196,6 +1196,11 @@ 
    <dimen name="smart_action_button_outline_stroke_width">2dp</dimen>

    <dimen name="notification_2025_smart_reply_button_corner_radius">24dp</dimen>

    <dimen name="notification_2025_smart_reply_button_min_height">48dp</dimen>

    <!-- The "inner" padding between the chip and the text should be 8dp, but since the chip

         drawable has an 8dp inset, we set the padding to be 8dp + 8dp to account for that. -->

    <dimen name="notification_2025_smart_reply_button_padding_vertical">16dp</dimen>

    <dimen name="notification_2025_smart_reply_button_padding_horizontal">12dp</dimen>

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



    <!-- Animated Action params. -->

    <!-- Corner radius = half of min_height to create rounded sides. -->
@@ -1203,7 +1208,9 @@ 
    <dimen name="animated_action_button_icon_size">20dp</dimen>

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

    <dimen name="animated_action_button_padding_horizontal">12dp</dimen>

    <dimen name="animated_action_button_padding_vertical">14dp</dimen>

    <!-- The "inner" padding between the chip and the text should be 8dp, but since the chip

         drawable has an 8dp inset, we set the padding to be 8dp + 8dp to account for that. -->

    <dimen name="animated_action_button_padding_vertical">16dp</dimen>

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

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

    <dimen name="animated_action_button_touch_target_height">48dp</dimen>

packages/SystemUI/src/com/android/systemui/statusbar/policy/SmartReplyStateInflater.kt

+3 −1
Original line number Diff line number Diff line
@@ -471,7 +471,9 @@ constructor( 
                        )

                    } else {

                        context.resources.getDimensionPixelSize(

                            R.dimen.smart_action_button_icon_size

                            if (notificationsRedesignTemplates())

                                R.dimen.notification_2025_smart_action_button_icon_size

                            else R.dimen.smart_action_button_icon_size

                        )

                    }

                val iconDrawable =