From ab55ee3e7d2f546a4e7fce9735da649392d9be5e Mon Sep 17 00:00:00 2001
From: Stefan Andonian <andonian@google.com>
Date: Mon, 17 Mar 2025 14:53:17 -0700
Subject: [PATCH] Update HomeSettings Font to Google Sans Flex

This will update everything in Launcher Home Settings except the At a Glance Dialog. That will be updated in a different CL. Also, the At A glance and Notifications settings landing pages are not owned by HomeSettings. These will be updated when the Settings app updates their fonts to Google Sans Flex, if that has not happened already.

Bug: 393616497
Test: Verified via hard-coded colors and more obvious fonts that these updates actually change the correct text views.
Flag: com.android.launcher3.gsf_res
Change-Id: I74f66760f0fdb486681a2db55df578c9bf50ef47
---
 res/values-v31/styles.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/res/values-v31/styles.xml b/res/values-v31/styles.xml
index 932ce38e59..6ed7dd67bd 100644
--- a/res/values-v31/styles.xml
+++ b/res/values-v31/styles.xml
@@ -17,7 +17,7 @@
 */
 -->
 
-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="HomeSettings.Theme" parent="@android:style/Theme.DeviceDefault.Settings">
         <item name="android:listPreferredItemPaddingEnd">16dp</item>
@@ -29,6 +29,7 @@
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
         <item name="preferenceTheme">@style/HomeSettings.PreferenceTheme</item>
+        <item name="android:fontFamily" android:featureFlag="com.android.launcher3.gsf_res">google-sans-flex</item>
     </style>
 
     <style name="HomeSettings.PreferenceTheme" parent="@style/PreferenceThemeOverlay">
@@ -80,11 +81,13 @@
 
     <style name="HomeSettings.CollapsedToolbarTitle"
             parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
-        <item name="android:fontFamily">google-sans</item>
+        <item name="android:fontFamily" android:featureFlag="!com.android.launcher3.gsf_res">google-sans</item>
+        <item name="android:fontFamily" android:featureFlag="com.android.launcher3.gsf_res">variable-title-large</item>
         <item name="android:textSize">20sp</item>
     </style>
 
     <style name="HomeSettings.ExpandedToolbarTitle" parent="HomeSettings.CollapsedToolbarTitle">
+        <item name="android:fontFamily" android:featureFlag="com.android.launcher3.gsf_res">variable-display-small</item>
         <item name="android:textSize">36sp</item>
     </style>
 </resources>
\ No newline at end of file