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

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

Merge changes I56886c71,Ifa16890e into main 

* changes:
  [Notif redesign] Update core notification fonts
  [Notif redesign] Update text appearance of guts buttons
parents 8a1059d7 a9b44413

core/java/android/app/notification.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -26,6 +26,14 @@ flag { 
  bug: "378660052"

}



flag {

  name: "notifications_redesign_fonts"

  namespace: "systemui"

  description: "Notifications Redesign: Update text styles in notification templates"

  bug: "409496809"

  is_fixed_read_only: true

}



# Flag for finalized API: In Nextfood but exported (and therefore must stay).

flag {

  name: "modes_api"

core/res/res/values/dimens.xml

+0 −3
Original line number Diff line number Diff line
@@ -268,9 +268,6 @@ 
     72dp (content margin) - 12dp (action padding) - 4dp (button inset) -->

    <dimen name="notification_2025_actions_margin_start">56dp</dimen>



    <!-- Notification action button text size -->

    <dimen name="notification_2025_action_text_size">16sp</dimen>



    <!-- The margin on the end of most content views (ignores the expander) -->

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

core/res/res/values/styles_device_defaults.xml

+14 −7
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ easier. 
                        PLEASE READ

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

 -->

<resources>

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

    <!-- Widget Styles -->

    <style name="Widget.DeviceDefault" parent="Widget.Material"/>

    <style name="Widget.DeviceDefault.Button" parent="Widget.Material.Button"/>
@@ -285,22 +285,29 @@ easier. 
        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Notification" parent="TextAppearance.Material.Notification">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

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

        <item name="fontFamily" android:featureFlag="!android.app.notifications_redesign_fonts">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Notification.Title" parent="TextAppearance.Material.Notification.Title">

        <item name="fontFamily">@string/config_headlineFontFamilyMedium</item>

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

        <item name="fontFamily" android:featureFlag="!android.app.notifications_redesign_fonts">@string/config_headlineFontFamilyMedium</item>

    </style>

    <!-- unused as of the 2025 redesign -->

    <style name="TextAppearance.DeviceDefault.Notification.BigTitle" parent="TextAppearance.Material.Notification.BigTitle">

        <item name="fontFamily">@string/config_headlineFontFamilyMedium</item>

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

        <item name="fontFamily" android:featureFlag="!android.app.notifications_redesign_fonts">@string/config_headlineFontFamilyMedium</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Notification.Reply" parent="TextAppearance.Material.Notification.Reply">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

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

        <item name="fontFamily" android:featureFlag="!android.app.notifications_redesign_fonts">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Notification.Info" parent="TextAppearance.Material.Notification.Info">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

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

        <item name="fontFamily" android:featureFlag="!android.app.notifications_redesign_fonts">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Notification.Time" parent="TextAppearance.Material.Notification.Time">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

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

        <item name="fontFamily" android:featureFlag="!android.app.notifications_redesign_fonts">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Widget" parent="TextAppearance.Material.Widget">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

core/res/res/values/styles_material.xml

+4 −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">

    <!-- Preference styles -->

    <eat-comment/>
@@ -474,13 +474,14 @@ please see styles_device_defaults.xml. 


    <style name="TextAppearance.Material.Notification.Title">

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

        <item name="fontFamily">sans-serif-medium</item>

        <item name="fontFamily" android:featureFlag="!android.app.notifications_redesign_fonts">sans-serif-medium</item>

        <item name="textSize">@dimen/notification_title_text_size</item>

    </style>



    <!-- unused as of the 2025 redesign -->

    <style name="TextAppearance.Material.Notification.BigTitle">

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

        <item name="fontFamily">sans-serif-medium</item>

        <item name="fontFamily" android:featureFlag="!android.app.notifications_redesign_fonts">sans-serif-medium</item>

        <item name="textSize">@dimen/notification_big_title_text_size</item>

    </style>

packages/SystemUI/res/layout/notification_2025_info.xml

+2 −3
Original line number Diff line number Diff line
@@ -346,7 +346,6 @@ 
                android:minHeight="@dimen/notification_2025_min_tap_target_size"

                android:maxWidth="200dp"

                style="@style/TextAppearance.NotificationInfo.Button"

                android:textSize="@*android:dimen/notification_2025_action_text_size"

                />

            <TextView

                android:id="@+id/turn_off_notifications"
@@ -364,7 +363,7 @@ 
                app:layout_constraintStart_toEndOf="@id/inline_dismiss"

                app:layout_constraintBaseline_toBaselineOf="@id/inline_dismiss"

                style="@style/TextAppearance.NotificationInfo.Button"

                android:textSize="@*android:dimen/notification_2025_action_text_size"/>

                />

            <TextView

                android:id="@+id/done"

                android:text="@string/inline_ok_button"
@@ -378,7 +377,7 @@ 
                android:minHeight="@dimen/notification_2025_min_tap_target_size"

                android:maxWidth="125dp"

                style="@style/TextAppearance.NotificationInfo.Button"

                android:textSize="@*android:dimen/notification_2025_action_text_size"/>

                />

            <androidx.constraintlayout.helper.widget.Flow

                android:layout_width="match_parent"

                android:layout_height="wrap_content"