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

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

Merge "[Notif redesign] Update fonts of text in the shade" into main

parents d6bf7ae3 665b0f97

packages/SystemUI/res/layout/notification_2025_footer.xml

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
            android:drawablePadding="8dp"

            android:gravity="center"

            android:text="@string/unlock_to_see_notif_text"

            android:textAppearance="?android:attr/textAppearanceButton"

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

            android:visibility="gone" />



        <androidx.constraintlayout.widget.ConstraintLayout

packages/SystemUI/res/layout/status_bar_no_notifications.xml

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
                android:layout_height="wrap_content"

                android:minHeight="64dp"

                android:gravity="center"

                android:textAppearance="?android:attr/textAppearanceButton"

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

                android:text="@string/empty_shade_text"/>

        <TextView

                android:id="@+id/no_notifications_footer"
@@ -44,7 +44,7 @@ 
                android:gravity="center"

                android:drawablePadding="8dp"

                android:visibility="gone"

                android:textAppearance="?android:attr/textAppearanceButton"

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

                android:text="@string/unlock_to_see_notif_text"/>

    </LinearLayout>

</com.android.systemui.statusbar.notification.emptyshade.ui.view.EmptyShadeView>

packages/SystemUI/res/values/styles.xml

+13 −0
Original line number Diff line number Diff line
@@ -750,11 +750,13 @@ 
        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>

    </style>



    <!-- unused -->

    <style name="TextAppearance.NotificationInfo.Confirmation">

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

        <item name="android:alpha">0.87</item>

    </style>



    <!-- unused -->

    <style name="TextAppearance.NotificationInfo">

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

    </style>
@@ -846,10 +848,12 @@ 
        parent="@android:style/Widget.DeviceDefault.Button.Borderless">

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

        <item name="android:textAllCaps">false</item>

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

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

        <item name="android:minWidth">0dp</item>

    </style>



    <!-- unused -->

    <style

        name="TextAppearance.NotificationSectionHeaderButton"

        parent="@android:style/Widget.DeviceDefault.Button.Borderless">
@@ -868,9 +872,11 @@ 
        <item name="android:minWidth">0dp</item>

    </style>



    <!-- TODO: b/375010573 - merge with style above when inlining the flag. -->

    <style

        name="TextAppearance.NotificationFooterButtonRedesign"

        parent="@android:style/Widget.DeviceDefault.Button.Borderless">

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

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

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

        <item name="android:textAllCaps">false</item>
@@ -878,6 +884,13 @@ 
        <item name="android:minWidth">0dp</item>

    </style>



    <style name="TextAppearance.NotificationShadeText"

        parent="@android:style/TextAppearance.DeviceDefault.Widget.Button">

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

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

        <item name="android:textSize" android:featureFlag="android.app.notifications_redesign_fonts">16sp</item>

    </style>



    <style name="TextAppearance.NotificationMenuButtonText">

        <item name="android:textSize">@dimen/notification_importance_header_text</item>

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>