Launcher3: Use font configs instead hardcoded fonts

Change-Id: Ia9a954cd3fe3e2b56d791f3fc88283603a342664
Signed-off-by: Pranav Vashi <[email protected]>

Author: neobuddy89

go/quickstep/res/values/styles.xml

@@ -41,7 +41,7 @@
     </style>
 
     <style name="GoOverviewActionButtonCaption">
-        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>
         <item name="android:textSize">14dp</item>
         <item name="android:textColor">?attr/overviewButtonTextColor</item>
         <item name="android:lineHeight">20dp</item>
@@ -61,7 +61,7 @@
 
     <!-- Modal Dialogs -->
     <style name="ModalDialogTitle">
-        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
         <item name="android:textSize">20sp</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:lineHeight">24dp</item>
@@ -71,7 +71,7 @@
     </style>
 
     <style name="ModalDialogText">
-        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>
         <item name="android:textSize">16sp</item>
         <item name="android:textColor">?android:attr/textColorTertiary</item>
         <item name="android:lineHeight">24dp</item>

quickstep/res/layout/floating_desktop_app_select.xml

@@ -34,7 +34,7 @@
         android:drawablePadding="@dimen/desktop_mode_floating_app_select_text_margin"
         android:drawableStart="@drawable/ic_desktop"
         android:drawableTint="?androidprv:attr/materialColorOnPrimaryContainer"
-        android:fontFamily="google-sans-medium"
+        android:fontFamily="@*android:string/config_bodyFontFamilyMedium"
         android:gravity="center_vertical"
         android:text="@string/desktop_select_app_toast"
         android:textColor="?androidprv:attr/materialColorOnPrimaryContainer"
@@ -47,7 +47,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/desktop_mode_floating_app_select_margin"
         android:minWidth="0dp"
-        android:fontFamily="google-sans-medium"
+        android:fontFamily="@*android:string/config_bodyFontFamilyMedium"
         android:text="@string/desktop_button_close_app_toast"
         android:textAllCaps="false"
         android:textColor="?androidprv:attr/materialColorPrimary"

quickstep/res/layout/predicted_hotseat_edu.xml

@@ -42,7 +42,7 @@
             android:paddingLeft="@dimen/bottom_sheet_edu_padding"
             android:paddingRight="@dimen/bottom_sheet_edu_padding"
             android:text="@string/hotseat_edu_title_migrate"
-            android:fontFamily="google-sans"
+            android:fontFamily="@*android:string/config_bodyFontFamily"
             android:textAlignment="center"
             android:textColor="@android:color/white"
             android:textSize="20sp" />

quickstep/res/values/styles.xml

@@ -42,7 +42,7 @@
         parent="TextAppearance.GestureTutorial">
         <item name="android:gravity">start</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:fontFamily">google-sans</item>
+        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
         <item name="android:letterSpacing">0.03</item>
         <item name="android:textSize">36sp</item>
         <item name="android:lineHeight">44sp</item>
@@ -79,7 +79,7 @@
     <style name="TextAppearance.GestureTutorial.Dialog.Title"
         parent="TextAppearance.GestureTutorial.Feedback.Title">
         <item name="android:gravity">center_horizontal</item>
-        <item name="android:fontFamily">google-sans</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
         <item name="android:lineHeight">32sp</item>
         <item name="android:textSize">24sp</item>
     </style>
@@ -88,7 +88,7 @@
         parent="TextAppearance.GestureTutorial">
         <item name="android:gravity">start</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:fontFamily">google-sans-text</item>
+        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
         <item name="android:letterSpacing">0.03</item>
         <item name="android:textSize">14sp</item>
         <item name="android:lineHeight">20sp</item>
@@ -103,7 +103,7 @@
     <style name="TextAppearance.GestureTutorial.Dialog.Subtitle"
         parent="TextAppearance.GestureTutorial.Feedback.Subtitle">
         <item name="android:gravity">center_horizontal</item>
-        <item name="android:fontFamily">google-sans-text</item>
+        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
         <item name="android:letterSpacing">0.025</item>
         <item name="android:lineHeight">20sp</item>
         <item name="android:textSize">14sp</item>
@@ -128,7 +128,7 @@
         <item name="android:letterSpacing">0.02</item>
         <item name="android:textSize">16sp</item>
         <item name="android:textAllCaps">false</item>
-        <item name="android:fontFamily">google-sans-text-medium</item>
+        <item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>
     </style>
 
     <style name="TextAppearance.GestureTutorial.ButtonLabel.Home"
@@ -164,7 +164,7 @@
     <style name="TextAppearance.GestureTutorial.MainTitle"
         parent="TextAppearance.GestureTutorial">
         <item name="android:textSize">36sp</item>
-        <item name="android:fontFamily">google-sans</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
     </style>
 
     <style name="TextAppearance.GestureTutorial.MainTitle.Home"
@@ -201,7 +201,7 @@
         parent="TextAppearance.GestureTutorial.Subtitle">
         <item name="android:textSize">16sp</item>
         <item name="android:letterSpacing">0.02</item>
-        <item name="android:fontFamily">google-sans-text</item>
+        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
         <item name="android:textColor">?attr/tutorialSubtitle</item>
     </style>
 
@@ -255,18 +255,18 @@
 
     <style name="TextAppearance.TaskbarEduTooltip.Title" parent="@android:style/TextAppearance.DeviceDefault.DialogWindowTitle">
         <item name="android:gravity">center_horizontal</item>
-        <item name="android:fontFamily">google-sans</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
         <item name="android:textSize">24sp</item>
     </style>
 
     <style name="TextAppearance.TaskbarEduTooltip.Subtext" parent="android:TextAppearance.Material.Body1">
         <item name="android:layout_marginTop">16dp</item>
-        <item name="android:fontFamily">google-sans-text</item>
+        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
         <item name="android:textSize">14sp</item>
     </style>
 
     <style name="KeyboardQuickSwitchText">
-        <item name="fontFamily">google-sans-text</item>
+        <item name="fontFamily">@*android:string/config_bodyFontFamily</item>
         <item name="android:textSize">14sp</item>
         <item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>
         <item name="lineHeight">20sp</item>
@@ -305,7 +305,7 @@
     </style>
 
     <style name="IconAppChipMenuTextStyle">
-        <item name="android:fontFamily">google-sans-text-medium</item>
+        <item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>
         <item name="android:textSize">@dimen/task_thumbnail_icon_menu_text_size</item>
         <item name="android:textColor">?androidprv:attr/materialColorOnSurface</item>
         <item name="android:letterSpacing">0.025</item>

quickstep/src/com/android/launcher3/appprediction/AppsDividerView.java

@@ -204,7 +204,7 @@ protected void onDraw(Canvas canvas) {
     private Layout getAllAppsLabelLayout() {
         if (mAllAppsLabelLayout == null) {
             mPaint.setAntiAlias(true);
-            mPaint.setTypeface(Typeface.create("google-sans", Typeface.NORMAL));
+            mPaint.setTypeface(Typeface.create("@*android:string/config_bodyFontFamilyMedium", Typeface.NORMAL));
             mPaint.setTextSize(
                     getResources().getDimensionPixelSize(R.dimen.all_apps_label_text_size));
 

res/layout/all_apps_empty_search.xml

@@ -23,7 +23,7 @@
     android:paddingBottom="8dp"
     android:paddingLeft="16dp"
     android:paddingRight="16dp"
-    android:fontFamily="sans-serif-medium"
+    android:fontFamily="@*android:string/config_bodyFontFamilyMedium"
     android:textSize="14sp"
     android:textColor="?android:attr/textColorTertiary"
     android:focusable="false" />

res/layout/drop_target_tool_tip.xml

@@ -27,5 +27,5 @@
     android:paddingStart="16dp"
     android:paddingTop="6.5dp"
     android:textSize="14sp"
-    android:fontFamily="sans-serif"
+    android:fontFamily="@*android:string/config_bodyFontFamily"
     android:textColor="?android:attr/colorForeground" />

res/values-v31/styles.xml

@@ -37,7 +37,7 @@
         <item name="preferenceScreenStyle">@style/HomeSettings.PreferenceScreenStyle</item>
         <item name="preferenceStyle">@style/HomeSettings.PreferenceStyle</item>
         <item name="switchPreferenceStyle">@style/HomeSettings.SwitchPreferenceStyle</item>
-        <item name="android:fontFamily">google-sans-text</item>
+        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
     </style>
 
     <style name="HomeSettings.CategoryStyle" parent="@style/Preference.Category.Material">
@@ -62,12 +62,12 @@
 
     <style name="HomeSettings.PreferenceTitle"
             parent="@android:style/TextAppearance.Material.Subhead">
-        <item name="android:fontFamily">google-sans</item>
+        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
         <item name="android:textSize">20sp</item>
     </style>
 
     <style name="HomeSettings.CategoryTitle" parent="@android:style/TextAppearance.Material.Body2">
-        <item name="android:fontFamily">google-sans-text-medium</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
     </style>
 
     <style name="HomeSettings.CollapsingToolbar" parent="@style/Theme.MaterialComponents.DayNight">
@@ -79,11 +79,11 @@
 
     <style name="HomeSettings.CollapsedToolbarTitle"
             parent="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Title">
-        <item name="android:fontFamily">google-sans</item>
+        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
         <item name="android:textSize">20sp</item>
     </style>
 
     <style name="HomeSettings.ExpandedToolbarTitle" parent="HomeSettings.CollapsedToolbarTitle">
         <item name="android:textSize">36sp</item>
     </style>
-</resources>
+</resources>

res/values/styles.xml

@@ -439,7 +439,7 @@
     <style name="PrivateSpaceHeaderTextStyle">
         <item name="android:textSize">16sp</item>
         <item name="android:textColor">@color/material_color_on_surface</item>
-        <item name="android:fontFamily">google-sans-text-medium</item>
+        <item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>
         <item name="android:ellipsize">end</item>
     </style>
 </resources>