base: styles: Use user fonts for Material UI themes
Only using user-selected fonts for a subset of system apps leads to an
inconsistent visual experience, so apply them to the system's Material
UI themes for consistency.
[ghostrider-reborn: revise for android 12]
Co-authored-by: Adithya R <gh0strider.2k18.reborn@gmail.com>
Change-Id: Ib0be558530ae101fae2a5c9e05610659a87cbae9
diff --git a/core/res/res/layout/accessibility_enable_service_warning.xml b/core/res/res/layout/accessibility_enable_service_warning.xml
index 01ef101..84520a2 100644
--- a/core/res/res/layout/accessibility_enable_service_warning.xml
+++ b/core/res/res/layout/accessibility_enable_service_warning.xml
@@ -51,7 +51,7 @@
android:gravity="center"
android:textSize="20sp"
android:textColor="?android:attr/textColorPrimary"
- android:fontFamily="google-sans-medium"/>
+ android:fontFamily="@string/config_headlineFontFamilyMedium"/>
<TextView
android:id="@+id/accessibility_permissionDialog_description"
diff --git a/core/res/res/layout/time_picker_material.xml b/core/res/res/layout/time_picker_material.xml
index 7597379..ee733f1 100644
--- a/core/res/res/layout/time_picker_material.xml
+++ b/core/res/res/layout/time_picker_material.xml
@@ -44,7 +44,7 @@
android:paddingTop="20dp"
android:paddingBottom="20dp"
android:includeFontPadding="false"
- android:fontFamily="sans-serif-medium"
+ android:fontFamily="@string/config_bodyFontFamilyMedium"
android:textSize="34sp"
android:textColor="@color/white"
android:text="@string/time_picker_header_text"/>
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index bf8e55f..5ae20e3 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -4856,7 +4856,7 @@
<integer translatable="false" name="config_storageManagerDaystoRetainDefault">90</integer>
<!-- Name of a font family to use for headlines. If empty, falls back to platform default -->
- <string name="config_headlineFontFamily" translatable="false"></string>
+ <string name="config_headlineFontFamily" translatable="false">@string/config_bodyFontFamily</string>
<!-- Allows setting custom fontFeatureSettings on specific text. -->
<string name="config_headlineFontFeatureSettings" translatable="false"></string>
@@ -4941,7 +4941,7 @@
<!-- Controls whether system buttons use all caps for text -->
<bool name="config_buttonTextAllCaps">true</bool>
<!-- Name of the font family used for system surfaces where the font should use medium weight -->
- <string name="config_headlineFontFamilyMedium" translateable="false">@string/font_family_button_material</string>
+ <string name="config_headlineFontFamilyMedium" translateable="false">@string/config_bodyFontFamilyMedium</string>
<!-- Name of a font family to use for body text. -->
<string name="config_bodyFontFamily" translatable="false">sans-serif</string>
<!-- Name of a font family to use for medium body text. -->
diff --git a/core/res/res/values/donottranslate_material.xml b/core/res/res/values/donottranslate_material.xml
index 9cf9f6cf..013b9a8 100644
--- a/core/res/res/values/donottranslate_material.xml
+++ b/core/res/res/values/donottranslate_material.xml
@@ -17,16 +17,16 @@
<resources>
<string name="font_family_display_4_material">sans-serif-light</string>
- <string name="font_family_display_3_material">sans-serif</string>
- <string name="font_family_display_2_material">sans-serif</string>
- <string name="font_family_display_1_material">sans-serif</string>
- <string name="font_family_headline_material">sans-serif</string>
- <string name="font_family_title_material">sans-serif-medium</string>
- <string name="font_family_subhead_material">sans-serif</string>
- <string name="font_family_menu_material">sans-serif</string>
- <string name="font_family_body_2_material">sans-serif-medium</string>
- <string name="font_family_body_1_material">sans-serif</string>
- <string name="font_family_caption_material">sans-serif</string>
- <string name="font_family_button_material">sans-serif-medium</string>
+ <string name="font_family_display_3_material">@string/config_bodyFontFamily</string>
+ <string name="font_family_display_2_material">@string/config_bodyFontFamily</string>
+ <string name="font_family_display_1_material">@string/config_bodyFontFamily</string>
+ <string name="font_family_headline_material">@string/config_headlineFontFamily</string>
+ <string name="font_family_title_material">@string/config_headlineFontFamilyMedium</string>
+ <string name="font_family_subhead_material">@string/config_bodyFontFamily</string>
+ <string name="font_family_menu_material">@string/config_bodyFontFamily</string>
+ <string name="font_family_body_2_material">@string/config_bodyFontFamilyMedium</string>
+ <string name="font_family_body_1_material">@string/config_bodyFontFamily</string>
+ <string name="font_family_caption_material">@string/config_bodyFontFamily</string>
+ <string name="font_family_button_material">@string/config_bodyFontFamilyMedium</string>
</resources>
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 596218a..76b935e 100644
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -5128,16 +5128,16 @@
<string name="time_placeholder">--</string>
<!-- DO NOT TRANSLATE -->
- <string name="radial_numbers_typeface">sans-serif</string>
+ <string name="radial_numbers_typeface">@string/config_bodyFontFamily</string>
<!-- DO NOT TRANSLATE -->
- <string name="sans_serif">sans-serif</string>
+ <string name="sans_serif">@string/config_bodyFontFamily</string>
<!-- DO NOT TRANSLATE -->
- <string name="date_picker_month_typeface">sans-serif-medium</string>
+ <string name="date_picker_month_typeface">@string/config_bodyFontFamilyMedium</string>
<!-- DO NOT TRANSLATE -->
- <string name="date_picker_day_of_week_typeface">sans-serif-medium</string>
+ <string name="date_picker_day_of_week_typeface">@string/config_bodyFontFamilyMedium</string>
<!-- DO NOT TRANSLATE -->
- <string name="date_picker_day_typeface">sans-serif-medium</string>
+ <string name="date_picker_day_typeface">@string/config_bodyFontFamilyMedium</string>
<!-- Lock-to-app unlock pin string -->
<string name="lock_to_app_unlock_pin">Ask for PIN before unpinning</string>
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index 619ec31..5eae2d7 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -997,7 +997,7 @@
</style>
<style name="TextAppearance.Tooltip">
- <item name="fontFamily">sans-serif</item>
+ <item name="fontFamily">@*android:string/config_bodyFontFamily</item>
<item name="textSize">14sp</item>
</style>
diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml
index eec6ae3..2446054 100644
--- a/core/res/res/values/styles_material.xml
+++ b/core/res/res/values/styles_material.xml
@@ -429,7 +429,7 @@
<style name="TextAppearance.Material.TimePicker.InputHeader" parent="TextAppearance.Material">
<item name="textSize">@dimen/text_size_display_1_material</item>
<item name="textColor">@color/white</item>
- <item name="fontFamily">sans-serif-medium</item>
+ <item name="fontFamily">@string/config_bodyFontFamilyMedium</item>
</style>
<style name="TextAppearance.Material.TimePicker.InputField" parent="TextAppearance.Material">
@@ -438,31 +438,31 @@
<style name="TextAppearance.Material.TimePicker.PromptLabel" parent="TextAppearance.Material">
<item name="textSize">@dimen/timepicker_text_size_normal</item>
- <item name="fontFamily">sans-serif-medium</item>
+ <item name="fontFamily">@string/config_bodyFontFamilyMedium</item>
</style>
<style name="TextAppearance.Material.DatePicker.YearLabel" parent="TextAppearance.Material">
<item name="textColor">@color/primary_text_secondary_when_activated_material_inverse</item>
<item name="textSize">@dimen/date_picker_year_label_size</item>
- <item name="fontFamily">sans-serif-medium</item>
+ <item name="fontFamily">@string/config_bodyFontFamilyMedium</item>
</style>
<style name="TextAppearance.Material.DatePicker.DateLabel" parent="TextAppearance.Material">
<item name="textColor">@color/primary_text_secondary_when_activated_material_inverse</item>
<item name="textSize">@dimen/date_picker_date_label_size</item>
- <item name="fontFamily">sans-serif-medium</item>
+ <item name="fontFamily">@string/config_bodyFontFamilyMedium</item>
</style>
<style name="TextAppearance.Material.DatePicker.List.YearLabel" parent="TextAppearance.Material">
<item name="textColor">?attr/textColorPrimary</item>
<item name="textSize">@dimen/datepicker_list_year_label_size</item>
- <item name="fontFamily">sans-serif</item>
+ <item name="fontFamily">@string/config_bodyFontFamily</item>
</style>
<style name="TextAppearance.Material.DatePicker.List.YearLabel.Activated">
<item name="textColor">?attr/colorControlActivated</item>
<item name="textSize">@dimen/datepicker_list_year_activated_label_size</item>
- <item name="fontFamily">sans-serif-medium</item>
+ <item name="fontFamily">@string/config_bodyFontFamilyMedium</item>
</style>
<style name="TextAppearance.Material.Notification">
@@ -474,13 +474,13 @@
<style name="TextAppearance.Material.Notification.Title">
<item name="textColor">@color/notification_primary_text_color_current</item>
- <item name="fontFamily">sans-serif-medium</item>
+ <item name="fontFamily">@string/config_bodyFontFamilyMedium</item>
<item name="textSize">@dimen/notification_title_text_size</item>
</style>
<style name="TextAppearance.Material.Notification.BigTitle">
<item name="textColor">@color/notification_primary_text_color_current</item>
- <item name="fontFamily">sans-serif-medium</item>
+ <item name="fontFamily">@string/config_bodyFontFamilyMedium</item>
<item name="textSize">@dimen/notification_big_title_text_size</item>
</style>
diff --git a/libs/WindowManager/Shell/res/layout/one_handed_tutorial.xml b/libs/WindowManager/Shell/res/layout/one_handed_tutorial.xml
index d29ed8b..8835289 100644
--- a/libs/WindowManager/Shell/res/layout/one_handed_tutorial.xml
+++ b/libs/WindowManager/Shell/res/layout/one_handed_tutorial.xml
@@ -42,7 +42,7 @@
android:layout_marginBottom="0dp"
android:gravity="center_horizontal"
android:textAlignment="center"
- android:fontFamily="google-sans-medium"
+ android:fontFamily="@*android:string/config_headlineFontFamily"
android:text="@string/one_handed_tutorial_title"
android:textSize="16sp"
android:textColor="@android:color/white"/>
diff --git a/packages/PrintSpooler/res/values/styles.xml b/packages/PrintSpooler/res/values/styles.xml
index 1e63a67e..1fb8997 100644
--- a/packages/PrintSpooler/res/values/styles.xml
+++ b/packages/PrintSpooler/res/values/styles.xml
@@ -28,7 +28,7 @@
<item name="android:layout_marginTop">16dip</item>
<item name="android:layout_marginBottom">16dip</item>
<item name="android:textColor">?android:attr/colorAccent</item>
- <item name="android:fontFamily">sans-serif-medium</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>
<item name="android:textSize">14sp</item>
</style>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/packages/SettingsLib/LayoutPreference/res/values/styles.xml b/packages/SettingsLib/LayoutPreference/res/values/styles.xml
index f958037..1cd5460 100644
--- a/packages/SettingsLib/LayoutPreference/res/values/styles.xml
+++ b/packages/SettingsLib/LayoutPreference/res/values/styles.xml
@@ -49,7 +49,7 @@
<item name="android:layout_gravity">center</item>
<item name="android:textSize">18sp</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
- <item name="android:fontFamily">google-sans-medium</item>
+ <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
<item name="android:layout_marginTop">8dp</item>
</style>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/packages/SystemUI/res/layout/contaminant_dialog.xml b/packages/SystemUI/res/layout/contaminant_dialog.xml
index 5f8c305..230df6c 100644
--- a/packages/SystemUI/res/layout/contaminant_dialog.xml
+++ b/packages/SystemUI/res/layout/contaminant_dialog.xml
@@ -32,7 +32,7 @@
android:paddingTop="18dp"
android:paddingBottom="18dp"
android:textAlignment="center"
- android:fontFamily="google-sans-medium"
+ android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
android:textSize="20sp"
android:textStyle="bold"
android:textColor="?android:attr/textColorPrimary"/>
diff --git a/packages/SystemUI/res/layout/keyboard_shortcuts_category_title.xml b/packages/SystemUI/res/layout/keyboard_shortcuts_category_title.xml
index 4f100f6..5598ca8 100644
--- a/packages/SystemUI/res/layout/keyboard_shortcuts_category_title.xml
+++ b/packages/SystemUI/res/layout/keyboard_shortcuts_category_title.xml
@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:textSize="14sp"
- android:fontFamily="sans-serif-medium"
+ android:fontFamily="@*android:string/config_bodyFontFamilyMedium"
android:importantForAccessibility="yes"
android:paddingTop="20dp"
android:paddingBottom="10dp"/>
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index e3d4419..e44642da 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -175,21 +175,21 @@
</style>
<style name="TextAppearance.AuthCredential.Title">
- <item name="android:fontFamily">google-sans</item>
+ <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
<item name="android:paddingTop">12dp</item>
<item name="android:paddingHorizontal">24dp</item>
<item name="android:textSize">24sp</item>
</style>
<style name="TextAppearance.AuthCredential.Subtitle">
- <item name="android:fontFamily">google-sans</item>
+ <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
<item name="android:paddingTop">8dp</item>
<item name="android:paddingHorizontal">24dp</item>
<item name="android:textSize">16sp</item>
</style>
<style name="TextAppearance.AuthCredential.Description">
- <item name="android:fontFamily">google-sans</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
<item name="android:paddingTop">8dp</item>
<item name="android:paddingHorizontal">24dp</item>
<item name="android:textSize">14sp</item>