From 53c9b1691b191520c183b33b73ecf15e69ecf3ef Mon Sep 17 00:00:00 2001
From: Justin Weir <justinweir@google.com>
Date: Mon, 17 Mar 2025 15:27:58 -0400
Subject: Update shade header fonts

Bug: 393609960
Test: Compared two screenshots with and without the flagged font
Flag: com.android.systemui.shade_header_font_update
Change-Id: Ia4ed24440921eabe2227cb640d742341a2b7a0a9
---
 packages/SystemUI/res/layout/combined_qs_header.xml |  2 +-
 packages/SystemUI/res/values/styles.xml             | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/SystemUI/res/layout/combined_qs_header.xml b/packages/SystemUI/res/layout/combined_qs_header.xml
index 5c06585de99c..65d17042412b 100644
--- a/packages/SystemUI/res/layout/combined_qs_header.xml
+++ b/packages/SystemUI/res/layout/combined_qs_header.xml
@@ -85,7 +85,7 @@ frame when animating QS <-> QQS transition
         android:paddingEnd="@dimen/status_bar_left_clock_end_padding"
         android:singleLine="true"
         android:textDirection="locale"
-        android:textAppearance="@style/TextAppearance.QS.Status"
+        android:textAppearance="@style/TextAppearance.QS.Status.Clock"
         android:fontFeatureSettings="tnum"
         android:transformPivotX="0dp"
         android:transformPivotY="24dp"
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index a479f1841ca4..948971cbcdef 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -184,15 +184,19 @@
         <item name="android:textColor">@androidprv:color/materialColorOnSurfaceVariant</item>
     </style>
 
-    <!-- This is hard coded to be sans-serif-condensed to match the icons -->
-
     <style name="TextAppearance.QS.Status">
-        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
+        <item name="android:fontFamily" android:featureFlag="!com.android.systemui.shade_header_font_update">@*android:string/config_headlineFontFamily</item>
+        <item name="android:fontFamily" android:featureFlag="com.android.systemui.shade_header_font_update">variable-body-medium-emphasized</item>
         <item name="android:textColor">@color/shade_header_text_color</item>
         <item name="android:textSize">14sp</item>
         <item name="android:letterSpacing">0.01</item>
     </style>
 
+    <style name="TextAppearance.QS.Status.Clock">
+        <item name="android:fontFamily" android:featureFlag="!com.android.systemui.shade_header_font_update">@*android:string/config_headlineFontFamily</item>
+        <item name="android:fontFamily" android:featureFlag="com.android.systemui.shade_header_font_update">variable-display-small-emphasized</item>
+    </style>
+
     <style name="TextAppearance.QS.Status.Build">
         <item name="android:textColor">?attr/onShadeInactiveVariant</item>
     </style>
-- 
cgit v1.2.3-59-g8ed1b