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

Commit 6f217edf authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Notif redesign] Update fonts in actions & smart replies" into main

parents 1fb6fb15 91a735fb

core/res/res/values/styles.xml

+8 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ please see styles_device_defaults.xml. 
                        PLEASE READ

===============================================================

 -->

<resources>

<resources xmlns:android="http://schemas.android.com/apk/res/android">

    <!-- Global Theme Styles -->

    <eat-comment/>
@@ -1638,12 +1638,17 @@ please see styles_device_defaults.xml. 


    <!-- The style for normal action button on notification -->

    <style name="NotificationAction" parent="Widget.Material.Light.Button.Borderless.Small">

        <item name="textColor">@color/notification_action_button_text_color</item>

        <item name="fontFamily" android:featureFlag="android.app.notifications_redesign_fonts">variable-title-small-emphasized</item>



        <item name="textColor" android:featureFlag="android.app.notifications_redesign_fonts">@color/materialColorPrimary</item>

        <item name="textColor" android:featureFlag="!android.app.notifications_redesign_fonts">@color/notification_action_button_text_color</item>



        <item name="background">@drawable/notification_material_action_background</item>

    </style>



    <!-- The style for emphasized action button on notification: Colored bordered ink button -->

    <!-- The style for emphasized action button on notification (used e.g. for calls): Colored bordered ink button -->

    <style name="NotificationEmphasizedAction" parent="Widget.Material.Button">

        <item name="fontFamily" android:featureFlag="android.app.notifications_redesign_fonts">variable-title-medium-emphasized</item>

        <item name="background">@drawable/btn_notification_emphasized</item>

        <item name="stateListAnimator">@anim/flat_button_state_list_anim_material</item>

    </style>

packages/SystemUI/res/layout/notification_2025_smart_action_button.xml

+1 −3
Original line number Diff line number Diff line
@@ -25,9 +25,7 @@ 
        android:paddingVertical="@dimen/smart_reply_button_padding_vertical"

        android:background="@drawable/notification_2025_smart_reply_button_background"

        android:gravity="center"

        android:fontFamily="google-sans-flex"

        android:textSize="@dimen/smart_reply_button_font_size"

        android:textColor="@color/smart_reply_button_text"

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

        android:paddingStart="@dimen/smart_reply_button_action_padding_left"

        android:paddingEnd="@dimen/smart_reply_button_padding_horizontal"

        android:drawablePadding="@dimen/smart_action_button_icon_padding"

packages/SystemUI/res/layout/notification_2025_smart_reply_button.xml

+1 −3
Original line number Diff line number Diff line
@@ -27,9 +27,7 @@ 
        android:paddingVertical="@dimen/smart_reply_button_padding_vertical"

        android:background="@drawable/notification_2025_smart_reply_button_background"

        android:gravity="center"

        android:fontFamily="google-sans-flex"

        android:textSize="@dimen/smart_reply_button_font_size"

        android:textColor="@color/smart_reply_button_text"

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

        android:paddingStart="@dimen/smart_reply_button_padding_horizontal"

        android:paddingEnd="@dimen/smart_reply_button_padding_horizontal"

        android:textStyle="normal"

packages/SystemUI/res/values/styles.xml

+5 −0
Original line number Diff line number Diff line
@@ -898,6 +898,11 @@ 
        <item name="android:gravity">center</item>

    </style>



    <style name="TextAppearance.NotificationSmartReply">

        <item name="android:textSize">12sp</item>

        <item name="android:textColor">@androidprv:color/materialColorOnSurface</item>

        <item name="android:fontFamily">variable-label-medium</item>

    </style>



    <style name="TextAppearance.HeadsUpStatusBarText"

        parent="@*android:style/TextAppearance.DeviceDefault.Notification.Info">