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

Commit 74432f49 authored by Ioana Alexandru's avatar Ioana Alexandru
Browse files

[Notif redesign] Update text style in guts priority btn 

Update the font and color of text in the guts priority option based on
the design spec. Also update the associated icon color accordingly.

Bug: 394822197
Bug: 409496809
Flag: android.app.notifications_redesign_fonts
Test: manual
Change-Id: I4991b410ce8cc861905293c1870164fff633cc48
parent da985263

packages/SystemUI/res/layout/notification_2025_conversation_info.xml

+3 −3
Original line number Original line Diff line number Diff line
@@ -234,7 +234,7 @@ 
                    android:paddingEnd="@*android:dimen/notification_2025_margin"

                    android:paddingEnd="@*android:dimen/notification_2025_margin"

                    android:src="@drawable/ic_important_outline"

                    android:src="@drawable/ic_important_outline"

                    android:background="@android:color/transparent"

                    android:background="@android:color/transparent"

                    android:tint="@color/notification_guts_priority_contents"

                    android:tint="@androidprv:color/materialColorOnSurface"

                    android:clickable="false"

                    android:clickable="false"

                    android:focusable="false"/>

                    android:focusable="false"/>

                <LinearLayout

                <LinearLayout
@@ -286,7 +286,7 @@ 
                    android:paddingEnd="@*android:dimen/notification_2025_margin"

                    android:paddingEnd="@*android:dimen/notification_2025_margin"

                    android:src="@drawable/ic_notifications_alert"

                    android:src="@drawable/ic_notifications_alert"

                    android:background="@android:color/transparent"

                    android:background="@android:color/transparent"

                    android:tint="@color/notification_guts_priority_contents"

                    android:tint="@androidprv:color/materialColorOnSurface"

                    android:clickable="false"

                    android:clickable="false"

                    android:focusable="false"/>

                    android:focusable="false"/>

                <LinearLayout

                <LinearLayout
@@ -339,7 +339,7 @@ 
                    android:paddingEnd="@*android:dimen/notification_2025_margin"

                    android:paddingEnd="@*android:dimen/notification_2025_margin"

                    android:src="@drawable/ic_notifications_silence"

                    android:src="@drawable/ic_notifications_silence"

                    android:background="@android:color/transparent"

                    android:background="@android:color/transparent"

                    android:tint="@color/notification_guts_priority_contents"

                    android:tint="@androidprv:color/materialColorOnSurface"

                    android:clickable="false"

                    android:clickable="false"

                    android:focusable="false"/>

                    android:focusable="false"/>

                <LinearLayout

                <LinearLayout

packages/SystemUI/res/layout/notification_2025_info.xml

+3 −3
Original line number Original line Diff line number Diff line
@@ -183,7 +183,7 @@ 
                    android:paddingEnd="@*android:dimen/notification_2025_margin"

                    android:paddingEnd="@*android:dimen/notification_2025_margin"

                    android:src="@drawable/ic_notifications_automatic"

                    android:src="@drawable/ic_notifications_automatic"

                    android:background="@android:color/transparent"

                    android:background="@android:color/transparent"

                    android:tint="@color/notification_guts_priority_contents"

                    android:tint="@androidprv:color/materialColorOnSurface"

                    android:clickable="false"

                    android:clickable="false"

                    android:focusable="false"/>

                    android:focusable="false"/>

                <LinearLayout

                <LinearLayout
@@ -236,7 +236,7 @@ 
                    android:paddingEnd="@*android:dimen/notification_2025_margin"

                    android:paddingEnd="@*android:dimen/notification_2025_margin"

                    android:src="@drawable/ic_notifications_alert"

                    android:src="@drawable/ic_notifications_alert"

                    android:background="@android:color/transparent"

                    android:background="@android:color/transparent"

                    android:tint="@color/notification_guts_priority_contents"

                    android:tint="@androidprv:color/materialColorOnSurface"

                    android:clickable="false"

                    android:clickable="false"

                    android:focusable="false"/>

                    android:focusable="false"/>

                <LinearLayout

                <LinearLayout
@@ -286,7 +286,7 @@ 
                    android:id="@+id/silence_icon"

                    android:id="@+id/silence_icon"

                    android:src="@drawable/ic_notifications_silence"

                    android:src="@drawable/ic_notifications_silence"

                    android:background="@android:color/transparent"

                    android:background="@android:color/transparent"

                    android:tint="@color/notification_guts_priority_contents"

                    android:tint="@androidprv:color/materialColorOnSurface"

                    android:layout_gravity="center"

                    android:layout_gravity="center"

                    android:layout_width="wrap_content"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_height="wrap_content"

packages/SystemUI/res/layout/promoted_notification_info.xml

+3 −3
Original line number Original line Diff line number Diff line
@@ -168,7 +168,7 @@ asked for it --> 
                    android:paddingEnd="@*android:dimen/notification_2025_margin"

                    android:paddingEnd="@*android:dimen/notification_2025_margin"

                    android:src="@drawable/ic_notifications_automatic"

                    android:src="@drawable/ic_notifications_automatic"

                    android:background="@android:color/transparent"

                    android:background="@android:color/transparent"

                    android:tint="@color/notification_guts_priority_contents"

                    android:tint="@androidprv:color/materialColorOnSurface"

                    android:clickable="false"

                    android:clickable="false"

                    android:focusable="false"/>

                    android:focusable="false"/>

                <LinearLayout

                <LinearLayout
@@ -221,7 +221,7 @@ asked for it --> 
                    android:paddingEnd="@*android:dimen/notification_2025_margin"

                    android:paddingEnd="@*android:dimen/notification_2025_margin"

                    android:src="@drawable/ic_notifications_alert"

                    android:src="@drawable/ic_notifications_alert"

                    android:background="@android:color/transparent"

                    android:background="@android:color/transparent"

                    android:tint="@color/notification_guts_priority_contents"

                    android:tint="@androidprv:color/materialColorOnSurface"

                    android:clickable="false"

                    android:clickable="false"

                    android:focusable="false"/>

                    android:focusable="false"/>

                <LinearLayout

                <LinearLayout
@@ -271,7 +271,7 @@ asked for it --> 
                    android:id="@+id/silence_icon"

                    android:id="@+id/silence_icon"

                    android:src="@drawable/ic_notifications_silence"

                    android:src="@drawable/ic_notifications_silence"

                    android:background="@android:color/transparent"

                    android:background="@android:color/transparent"

                    android:tint="@color/notification_guts_priority_contents"

                    android:tint="@androidprv:color/materialColorOnSurface"

                    android:layout_gravity="center"

                    android:layout_gravity="center"

                    android:layout_width="wrap_content"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_height="wrap_content"

packages/SystemUI/res/values/styles.xml

+18 −6
Original line number Original line Diff line number Diff line
@@ -816,16 +816,28 @@ 
    </style>

    </style>





    <style name="TextAppearance.NotificationImportanceDetail">

    <style name="TextAppearance.NotificationImportanceDetail">

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

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

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

        <item name="android:textSize" android:featureFlag="!android.app.notifications_redesign_fonts">@dimen/notification_importance_description_text</item>

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



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

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



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

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



        <item name="android:gravity">center</item>

        <item name="android:gravity">center</item>

    </style>

    </style>





    <style name="TextAppearance.NotificationImportanceButton">

    <style name="TextAppearance.NotificationImportanceButton">

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

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

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

        <item name="android:textSize" android:featureFlag="!android.app.notifications_redesign_fonts">@dimen/notification_importance_button_text</item>

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



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

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



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

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



        <item name="android:gravity">center</item>

        <item name="android:gravity">center</item>

    </style>

    </style>