summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPranav Vashi <neobuddy89@gmail.com>2020-01-14 17:14:06 +0300
committerSemavi Ulusoy <doc.divxm@gmail.com>2022-09-13 01:01:39 +0300
commit57762c3b75b63df54ab8fed03f297f24395d7892 (patch)
tree5b35112b61055b30510856deb470b71fca419de2
parentdb96f041f9de9228ed49efa3be6cff0a04d8931e (diff)
Dialer: Use system fonts
Signed-off-by: doc HD <doc.divxm@gmail.com> Change-Id: I8d0549d3b68a44cc6efba7ef4fb71b2863695fb7
-rw-r--r--java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java2
-rw-r--r--java/com/android/dialer/app/res/layout/phone_favorite_tile_view.xml4
-rw-r--r--java/com/android/dialer/app/res/values/styles.xml4
-rw-r--r--java/com/android/dialer/calldetails/res/values/styles.xml6
-rw-r--r--java/com/android/dialer/calllog/ui/res/values/styles.xml4
-rw-r--r--java/com/android/dialer/contacts/resources/res/layout-ldrtl/unread_count_tab.xml2
-rw-r--r--java/com/android/dialer/contacts/resources/res/layout/unread_count_tab.xml2
-rw-r--r--java/com/android/dialer/contacts/resources/res/values/styles.xml2
-rw-r--r--java/com/android/dialer/contactsfragment/res/layout/contact_row.xml4
-rw-r--r--java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml2
-rw-r--r--java/com/android/dialer/dialpadview/res/values-land/styles.xml8
-rw-r--r--java/com/android/dialer/dialpadview/res/values/styles.xml8
-rw-r--r--java/com/android/dialer/lettertile/LetterTileDrawable.java4
-rw-r--r--java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml4
-rw-r--r--java/com/android/dialer/main/impl/res/layout/promotion_bottom_sheet.xml4
-rw-r--r--java/com/android/dialer/rtt/res/values/styles.xml4
-rw-r--r--java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml6
-rw-r--r--java/com/android/dialer/spannable/ContentWithLearnMoreSpanner.java2
-rw-r--r--java/com/android/dialer/speeddial/res/layout/favorite_item_layout.xml4
-rw-r--r--java/com/android/dialer/theme/base/res/values/styles_dialer_light.xml2
-rw-r--r--java/com/android/dialer/theme/common/res/values/text_styles.xml16
-rw-r--r--java/com/android/dialer/voicemail/listui/error/res/values/styles.xml12
-rw-r--r--java/com/android/dialer/voicemail/listui/res/values/styles.xml4
-rw-r--r--java/com/android/dialer/widget/res/layout/text_view_preference.xml2
-rw-r--r--java/com/android/incallui/calllocation/impl/res/values/styles.xml10
-rw-r--r--java/com/android/incallui/commontheme/res/values/styles.xml2
-rw-r--r--java/com/android/incallui/res/layout/frag_rtt_request_dialog.xml4
-rw-r--r--java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml6
-rw-r--r--java/com/android/incallui/rtt/impl/res/values/styles.xml4
-rw-r--r--java/com/android/incallui/sessiondata/res/values/styles.xml2
30 files changed, 70 insertions, 70 deletions
diff --git a/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java b/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java
index 9d04cb2c8..a86eb3f16 100644
--- a/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java
+++ b/java/com/android/dialer/app/calllog/PhoneCallDetailsHelper.java
@@ -385,7 +385,7 @@ public class PhoneCallDetailsHelper
TextView title = new TextView(context);
title.setText(R.string.voicemail_donation_promo_title);
- title.setTypeface(Typeface.create("sans-serif-medium", Typeface.NORMAL));
+ title.setTypeface(Typeface.create("@*android:string/config_headlineFontFamilyMedium", Typeface.NORMAL));
title.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
title.setTextColor(ContextCompat.getColor(context, R.color.dialer_primary_text_color));
title.setPadding(
diff --git a/java/com/android/dialer/app/res/layout/phone_favorite_tile_view.xml b/java/com/android/dialer/app/res/layout/phone_favorite_tile_view.xml
index df7ce5c55..d44772965 100644
--- a/java/com/android/dialer/app/res/layout/phone_favorite_tile_view.xml
+++ b/java/com/android/dialer/app/res/layout/phone_favorite_tile_view.xml
@@ -71,7 +71,7 @@
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:fadingEdgeLength="3dip"
- android:fontFamily="sans-serif-medium"
+ android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
android:singleLine="true"
android:textAlignment="viewStart"
android:textColor="?colorTextOnUnthemedDarkBackground"
@@ -91,7 +91,7 @@
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:fadingEdgeLength="3dip"
- android:fontFamily="sans-serif"
+ android:fontFamily="@*android:string/config_bodyFontFamily"
android:gravity="center_vertical"
android:singleLine="true"
android:textAlignment="viewStart"
diff --git a/java/com/android/dialer/app/res/values/styles.xml b/java/com/android/dialer/app/res/values/styles.xml
index 0fa3503a4..6ddbc2545 100644
--- a/java/com/android/dialer/app/res/values/styles.xml
+++ b/java/com/android/dialer/app/res/values/styles.xml
@@ -52,7 +52,7 @@
parent="android:style/Widget.Material.Light.ActionBar.TabText">
<item name="android:textColor">?colorTextOnUnthemedDarkBackground</item>
<item name="android:textSize">@dimen/tab_text_size</item>
- <item name="android:fontFamily">"sans-serif-medium"</item>
+ <item name="android:fontFamily">"@*android:string/config_headlineFontFamilyMedium"</item>
</style>
<style name="CallLogActionStyle">
@@ -175,6 +175,6 @@
<style name="PromoLinkStyle">
<item name="android:textColor">?android:attr/colorPrimary</item>
- <item name="android:fontFamily">"sans-serif-medium"</item>
+ <item name="android:fontFamily">"@*android:string/config_headlineFontFamilyMedium"</item>
</style>
</resources>
diff --git a/java/com/android/dialer/calldetails/res/values/styles.xml b/java/com/android/dialer/calldetails/res/values/styles.xml
index 4b861f55b..da168e1c0 100644
--- a/java/com/android/dialer/calldetails/res/values/styles.xml
+++ b/java/com/android/dialer/calldetails/res/values/styles.xml
@@ -27,15 +27,15 @@
</style>
<style name="RttTranscriptLink">
- <item name="android:fontFamily">sans-serif-medium</item>
+ <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
<item name="android:textColor">@color/dialer_link_color</item>
<item name="android:textAllCaps">true</item>
<item name="textAllCaps">true</item>
</style>
<style name="RttTranscriptMessage" parent="Dialer.TextAppearance.Secondary">
- <item name="android:fontFamily">sans-serif</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
<item name="android:textAllCaps">false</item>
<item name="textAllCaps">false</item>
</style>
-</resources> \ No newline at end of file
+</resources>
diff --git a/java/com/android/dialer/calllog/ui/res/values/styles.xml b/java/com/android/dialer/calllog/ui/res/values/styles.xml
index 3a02eb23f..202323548 100644
--- a/java/com/android/dialer/calllog/ui/res/values/styles.xml
+++ b/java/com/android/dialer/calllog/ui/res/values/styles.xml
@@ -29,6 +29,6 @@
</style>
<style name="phoneaccount_textview_unread_call">
- <item name="android:fontFamily">sans-serif-medium</item>
+ <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
</style>
-</resources> \ No newline at end of file
+</resources>
diff --git a/java/com/android/dialer/contacts/resources/res/layout-ldrtl/unread_count_tab.xml b/java/com/android/dialer/contacts/resources/res/layout-ldrtl/unread_count_tab.xml
index 51d56bb22..a9e30f715 100644
--- a/java/com/android/dialer/contacts/resources/res/layout-ldrtl/unread_count_tab.xml
+++ b/java/com/android/dialer/contacts/resources/res/layout-ldrtl/unread_count_tab.xml
@@ -37,7 +37,7 @@
android:paddingLeft="@dimen/tab_unread_count_text_padding"
android:paddingRight="@dimen/tab_unread_count_text_padding"
android:background="@drawable/unread_count_background"
- android:fontFamily="sans-serif-medium"
+ android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
android:importantForAccessibility="no"
android:layoutDirection="locale"
android:minWidth="@dimen/tab_unread_count_background_size"
diff --git a/java/com/android/dialer/contacts/resources/res/layout/unread_count_tab.xml b/java/com/android/dialer/contacts/resources/res/layout/unread_count_tab.xml
index d8357f491..2c71daae9 100644
--- a/java/com/android/dialer/contacts/resources/res/layout/unread_count_tab.xml
+++ b/java/com/android/dialer/contacts/resources/res/layout/unread_count_tab.xml
@@ -33,7 +33,7 @@
android:paddingLeft="@dimen/tab_unread_count_text_padding"
android:paddingRight="@dimen/tab_unread_count_text_padding"
android:background="@drawable/unread_count_background"
- android:fontFamily="sans-serif-medium"
+ android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
android:gravity="center"
android:importantForAccessibility="no"
android:minWidth="@dimen/tab_unread_count_background_size"
diff --git a/java/com/android/dialer/contacts/resources/res/values/styles.xml b/java/com/android/dialer/contacts/resources/res/values/styles.xml
index 4f0b3f15f..e6a50fc0c 100644
--- a/java/com/android/dialer/contacts/resources/res/values/styles.xml
+++ b/java/com/android/dialer/contacts/resources/res/values/styles.xml
@@ -30,7 +30,7 @@
<style name="DirectoryHeaderStyle" parent="@android:style/TextAppearance.Small">
<item name="android:textSize">14sp</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
- <item name="android:fontFamily">sans-serif-medium</item>
+ <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
</style>
<!-- TextView style used for headers.
diff --git a/java/com/android/dialer/contactsfragment/res/layout/contact_row.xml b/java/com/android/dialer/contactsfragment/res/layout/contact_row.xml
index 3309ab474..32aecf579 100644
--- a/java/com/android/dialer/contactsfragment/res/layout/contact_row.xml
+++ b/java/com/android/dialer/contactsfragment/res/layout/contact_row.xml
@@ -52,6 +52,6 @@
android:gravity="center_vertical"
android:textSize="@dimen/text_size"
android:textColor="?android:attr/textColorPrimary"
- android:fontFamily="sans-serif"/>
+ android:fontFamily="@*android:string/config_bodyFontFamily"/>
</LinearLayout>
-</FrameLayout> \ No newline at end of file
+</FrameLayout>
diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml
index 9953fa3b4..c20b634c3 100644
--- a/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml
+++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml
@@ -120,7 +120,7 @@
android:background="@android:color/transparent"
android:cursorVisible="false"
android:focusableInTouchMode="true"
- android:fontFamily="sans-serif"
+ android:fontFamily="@*android:string/config_bodyFontFamily"
android:freezesText="true"
android:gravity="center"
android:importantForAutofill="no"
diff --git a/java/com/android/dialer/dialpadview/res/values-land/styles.xml b/java/com/android/dialer/dialpadview/res/values-land/styles.xml
index abf55584b..a04ae2348 100644
--- a/java/com/android/dialer/dialpadview/res/values-land/styles.xml
+++ b/java/com/android/dialer/dialpadview/res/values-land/styles.xml
@@ -20,7 +20,7 @@
<style name="DialpadKeyNumberStyle">
<item name="android:textColor">?attr/dialpad_text_color_primary</item>
<item name="android:textSize">?attr/dialpad_key_numbers_size</item>
- <item name="android:fontFamily">sans-serif-light</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_gravity">center</item>
@@ -29,7 +29,7 @@
<style name="DialpadKeyStarStyle">
<item name="android:textColor">?attr/dialpad_text_color_secondary</item>
<item name="android:textSize">@dimen/dialpad_key_star_size</item>
- <item name="android:fontFamily">sans-serif-light</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
<item name="android:alpha">0.8</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
@@ -40,7 +40,7 @@
<style name="DialpadKeyPoundStyle">
<item name="android:textColor">?attr/dialpad_text_color_secondary</item>
<item name="android:textSize">@dimen/dialpad_key_pound_size</item>
- <item name="android:fontFamily">sans-serif-light</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
<item name="android:alpha">0.8</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
@@ -51,7 +51,7 @@
<style name="DialpadKeyLettersStyle">
<item name="android:textColor">?attr/dialpad_text_color_secondary</item>
<item name="android:textSize">?attr/dialpad_key_letters_size_for_single_alphabet</item>
- <item name="android:fontFamily">sans-serif-regular</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_gravity">left|center_vertical</item>
diff --git a/java/com/android/dialer/dialpadview/res/values/styles.xml b/java/com/android/dialer/dialpadview/res/values/styles.xml
index 071c4bd44..712af38eac 100644
--- a/java/com/android/dialer/dialpadview/res/values/styles.xml
+++ b/java/com/android/dialer/dialpadview/res/values/styles.xml
@@ -25,7 +25,7 @@
<style name="DialpadKeyNumberStyle">
<item name="android:textColor">?attr/dialpad_text_color_primary</item>
<item name="android:textSize">?attr/dialpad_key_numbers_size</item>
- <item name="android:fontFamily">sans-serif-light</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginBottom">?attr/dialpad_key_number_margin_bottom</item>
@@ -35,7 +35,7 @@
<style name="DialpadKeyStarStyle">
<item name="android:textColor">?attr/dialpad_text_color_secondary</item>
<item name="android:textSize">@dimen/dialpad_key_star_size</item>
- <item name="android:fontFamily">sans-serif-light</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
<item name="android:alpha">0.8</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
@@ -46,7 +46,7 @@
<style name="DialpadKeyPoundStyle">
<item name="android:textColor">?attr/dialpad_text_color_secondary</item>
<item name="android:textSize">@dimen/dialpad_key_pound_size</item>
- <item name="android:fontFamily">sans-serif-light</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
<item name="android:alpha">0.8</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
@@ -57,7 +57,7 @@
<style name="DialpadKeyLettersStyle">
<item name="android:textColor">?attr/dialpad_text_color_secondary</item>
<item name="android:textSize">?attr/dialpad_key_letters_size_for_single_alphabet</item>
- <item name="android:fontFamily">sans-serif-regular</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_gravity">center</item>
diff --git a/java/com/android/dialer/lettertile/LetterTileDrawable.java b/java/com/android/dialer/lettertile/LetterTileDrawable.java
index b747c4f4c..3eb840295 100644
--- a/java/com/android/dialer/lettertile/LetterTileDrawable.java
+++ b/java/com/android/dialer/lettertile/LetterTileDrawable.java
@@ -129,7 +129,7 @@ public class LetterTileDrawable extends Drawable {
defaultSpamAvatar = res.getDrawable(R.drawable.quantum_ic_report_vd_theme_24, null);
defaultConferenceAvatar = res.getDrawable(R.drawable.quantum_ic_group_vd_theme_24, null);
- paint.setTypeface(Typeface.create("sans-serif-medium", Typeface.NORMAL));
+ paint.setTypeface(Typeface.create("@*android:string/config_headlineFontFamilyMedium", Typeface.NORMAL));
paint.setTextAlign(Align.CENTER);
paint.setAntiAlias(true);
paint.setFilterBitmap(true);
@@ -216,7 +216,7 @@ public class LetterTileDrawable extends Drawable {
// Scale text by canvas bounds and user selected scaling factor
paint.setTextSize(scale * letterToTileRatio * minDimension);
paint.getTextBounds(firstChar, 0, 1, rect);
- paint.setTypeface(Typeface.create("sans-serif", Typeface.NORMAL));
+ paint.setTypeface(Typeface.create("@*android:string/config_bodyFontFamily", Typeface.NORMAL));
paint.setColor(tileFontColor);
paint.setAlpha(ALPHA);
diff --git a/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml b/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml
index 02874a9d8..00f38c777 100644
--- a/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml
+++ b/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml
@@ -49,7 +49,7 @@
android:textSize="12sp"
android:textColor="?android:attr/textColorPrimaryInverse"
android:background="@drawable/notification_badge"
- android:fontFamily="sans-serif-medium"
+ android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
android:visibility="invisible"/>
</FrameLayout>
@@ -61,4 +61,4 @@
android:gravity="center_horizontal"
android:textSize="12sp"
style="@style/Dialer.TextAppearance.Secondary"/>
-</com.android.dialer.main.impl.bottomnav.BottomNavItem> \ No newline at end of file
+</com.android.dialer.main.impl.bottomnav.BottomNavItem>
diff --git a/java/com/android/dialer/main/impl/res/layout/promotion_bottom_sheet.xml b/java/com/android/dialer/main/impl/res/layout/promotion_bottom_sheet.xml
index 0edc03c3d..20fb264ee 100644
--- a/java/com/android/dialer/main/impl/res/layout/promotion_bottom_sheet.xml
+++ b/java/com/android/dialer/main/impl/res/layout/promotion_bottom_sheet.xml
@@ -66,11 +66,11 @@
android:layout_gravity="end"
android:paddingStart="16dp"
android:paddingEnd="16dp"
- android:fontFamily="sans-serif-medium"
+ android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
android:stateListAnimator="@null"
android:text="@string/ok_got_it"
android:textColor="@android:color/white"
android:textSize="16sp"/>
</LinearLayout>
-</LinearLayout> \ No newline at end of file
+</LinearLayout>
diff --git a/java/com/android/dialer/rtt/res/values/styles.xml b/java/com/android/dialer/rtt/res/values/styles.xml
index d8bc245ef..eb1e5b859 100644
--- a/java/com/android/dialer/rtt/res/values/styles.xml
+++ b/java/com/android/dialer/rtt/res/values/styles.xml
@@ -16,7 +16,7 @@
-->
<resources>
<style name="RttTranscriptBubble">
- <item name="android:fontFamily">sans-serif</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
<item name="android:textColor">#DD000000</item>
<item name="android:textSize">16sp</item>
</style>
@@ -33,4 +33,4 @@
<item name="android:textColor">#757575</item>
<item name="android:textSize">12sp</item>
</style>
-</resources> \ No newline at end of file
+</resources>
diff --git a/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml b/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml
index 4f8e305fe..659e46730 100644
--- a/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml
+++ b/java/com/android/dialer/searchfragment/common/res/layout/search_contact_row.xml
@@ -44,7 +44,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical|start"
- android:fontFamily="sans-serif"
+ android:fontFamily="@*android:string/config_bodyFontFamily"
style="@style/Dialer.TextAppearance.Primary"/>
<com.android.dialer.widget.BidiTextView
@@ -52,7 +52,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical|start"
- android:fontFamily="sans-serif"
+ android:fontFamily="@*android:string/config_bodyFontFamily"
style="@style/Dialer.TextAppearance.Secondary"/>
</LinearLayout>
@@ -77,4 +77,4 @@
android:tint="?colorIcon"
android:scaleType="centerInside"
android:visibility="gone"/>
-</RelativeLayout> \ No newline at end of file
+</RelativeLayout>
diff --git a/java/com/android/dialer/spannable/ContentWithLearnMoreSpanner.java b/java/com/android/dialer/spannable/ContentWithLearnMoreSpanner.java
index 50302af79..91cc60abc 100644
--- a/java/com/android/dialer/spannable/ContentWithLearnMoreSpanner.java
+++ b/java/com/android/dialer/spannable/ContentWithLearnMoreSpanner.java
@@ -78,7 +78,7 @@ public final class ContentWithLearnMoreSpanner {
int learnMoreSpanEndIndex = learnMoreSpanStartIndex + learnMore.length();
contents.setSpan(
- new TypefaceSpan("sans-serif-medium"),
+ new TypefaceSpan("@*android:string/config_headlineFontFamilyMedium"),
learnMoreSpanStartIndex,
learnMoreSpanEndIndex,
Spanned.SPAN_INCLUSIVE_INCLUSIVE);
diff --git a/java/com/android/dialer/speeddial/res/layout/favorite_item_layout.xml b/java/com/android/dialer/speeddial/res/layout/favorite_item_layout.xml
index 1299f08c7..a52cacb2d 100644
--- a/java/com/android/dialer/speeddial/res/layout/favorite_item_layout.xml
+++ b/java/com/android/dialer/speeddial/res/layout/favorite_item_layout.xml
@@ -66,7 +66,7 @@
android:layout_marginEnd="4dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="1dp"
- android:fontFamily="sans-serif-medium"
+ android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
android:textSize="14sp"
android:gravity="center_horizontal"
style="@style/Dialer.TextAppearance.Primary"/>
@@ -81,4 +81,4 @@
android:layout_marginBottom="17dp"
android:gravity="center_horizontal"
style="@style/Dialer.TextAppearance.Secondary"/>
-</LinearLayout> \ No newline at end of file
+</LinearLayout>
diff --git a/java/com/android/dialer/theme/base/res/values/styles_dialer_light.xml b/java/com/android/dialer/theme/base/res/values/styles_dialer_light.xml
index 5fecbaee5..41dc31c88 100644
--- a/java/com/android/dialer/theme/base/res/values/styles_dialer_light.xml
+++ b/java/com/android/dialer/theme/base/res/values/styles_dialer_light.xml
@@ -44,7 +44,7 @@
<item name="android:paddingStart">@dimen/call_log_action_horizontal_padding</item>
<item name="android:paddingEnd">@dimen/call_log_action_horizontal_padding</item>
<item name="android:textColor">?android:attr/colorPrimary</item>
- <item name="android:fontFamily">sans-serif-medium</item>
+ <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
<item name="android:focusable">true</item>
<item name="android:singleLine">true</item>
<item name="android:textAllCaps">true</item>
diff --git a/java/com/android/dialer/theme/common/res/values/text_styles.xml b/java/com/android/dialer/theme/common/res/values/text_styles.xml
index def5862d4..dfda8e478 100644
--- a/java/com/android/dialer/theme/common/res/values/text_styles.xml
+++ b/java/com/android/dialer/theme/common/res/values/text_styles.xml
@@ -22,43 +22,43 @@
<style name="Dialer.TextAppearance.Header1" parent="TextAppearance.AppCompat">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">18sp</item>
- <item name="android:fontFamily">sans-serif-regular</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
</style>
<style name="Dialer.TextAppearance.Header2" parent="TextAppearance.AppCompat">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">16sp</item>
- <item name="android:fontFamily">sans-serif-medium</item>
+ <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
</style>
<style name="Dialer.TextAppearance.SubHeader" parent="TextAppearance.AppCompat">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">16sp</item>
- <item name="android:fontFamily">sans-serif-medium</item>
+ <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
</style>
<style name="Dialer.TextAppearance.Primary" parent="TextAppearance.AppCompat">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">16sp</item>
- <item name="android:fontFamily">sans-serif-regular</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
</style>
<style name="Dialer.TextAppearance.Secondary" parent="TextAppearance.AppCompat">
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:textSize">14sp</item>
- <item name="android:fontFamily">sans-serif-regular</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
</style>
<style name="Dialer.TextAppearance.Secondary2" parent="TextAppearance.AppCompat">
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:textSize">12sp</item>
- <item name="android:fontFamily">sans-serif-regular</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
</style>
<style name="Dialer.TextAppearance.OVERLINE" parent="TextAppearance.AppCompat">
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:textSize">14sp</item>
- <item name="android:fontFamily">sans-serif-medium</item>
+ <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
</style>
<style name="Dialer.TextAppearance.Header1.Ellipsize">
@@ -95,4 +95,4 @@
<item name="android:ellipsize">end</item>
<item name="android:maxLines">1</item>
</style>
-</resources> \ No newline at end of file
+</resources>
diff --git a/java/com/android/dialer/voicemail/listui/error/res/values/styles.xml b/java/com/android/dialer/voicemail/listui/error/res/values/styles.xml
index 4267e8cd0..e7ee2f7fc 100644
--- a/java/com/android/dialer/voicemail/listui/error/res/values/styles.xml
+++ b/java/com/android/dialer/voicemail/listui/error/res/values/styles.xml
@@ -24,7 +24,7 @@
<item name="android:layout_marginEnd">8dp</item>
<item name="android:padding">8dp</item>
<item name="android:textColor">?android:attr/colorPrimary</item>
- <item name="android:fontFamily">"sans-serif-medium"</item>
+ <item name="android:fontFamily">"@*android:string/config_headlineFontFamilyMedium"</item>
<item name="android:focusable">true</item>
<item name="android:singleLine">true</item>
<item name="android:textAllCaps">true</item>
@@ -40,7 +40,7 @@
<item name="android:layout_marginEnd">8dp</item>
<item name="android:padding">8dp</item>
<item name="android:textColor">#757575</item>
- <item name="android:fontFamily">"sans-serif-medium"</item>
+ <item name="android:fontFamily">"@*android:string/config_headlineFontFamilyMedium"</item>
<item name="android:focusable">true</item>
<item name="android:singleLine">true</item>
<item name="android:textAllCaps">true</item>
@@ -58,25 +58,25 @@
<style name="TosTitleStyle">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">20sp</item>
- <item name="android:fontFamily">"sans-serif-medium"</item>
+ <item name="android:fontFamily">"@*android:string/config_headlineFontFamilyMedium"</item>
</style>
<style name="TosLinkStyle">
<item name="android:textColor">?android:attr/colorPrimary</item>
- <item name="android:fontFamily">"sans-serif-medium"</item>
+ <item name="android:fontFamily">"@*android:string/config_headlineFontFamilyMedium"</item>
</style>
<style name="TosTextStyle">
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/dialer_primary_text_color</item>
- <item name="android:fontFamily">"sans-serif-regular"</item>
+ <item name="android:fontFamily">"@string/config_bodyFontFamily"</item>
<item name="android:lineSpacingExtra">8sp</item>
</style>
<style name="TosDetailsTextStyle">
<item name="android:textSize">12sp</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
- <item name="android:fontFamily">"sans-serif-regular"</item>
+ <item name="android:fontFamily">"@string/config_bodyFontFamily"</item>
<item name="android:lineSpacingExtra">12sp</item>
</style>
</resources>
diff --git a/java/com/android/dialer/voicemail/listui/res/values/styles.xml b/java/com/android/dialer/voicemail/listui/res/values/styles.xml
index cbc010266..57f8d6723 100644
--- a/java/com/android/dialer/voicemail/listui/res/values/styles.xml
+++ b/java/com/android/dialer/voicemail/listui/res/values/styles.xml
@@ -26,13 +26,13 @@
<style name="TosTitleStyle">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">20sp</item>
- <item name="android:fontFamily">"sans-serif-medium"</item>
+ <item name="android:fontFamily">"@*android:string/config_headlineFontFamilyMedium"</item>
</style>
<style name="TosTextStyle">
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/dialer_primary_text_color</item>
- <item name="android:fontFamily">"sans-serif-regular"</item>
+ <item name="android:fontFamily">"@string/config_bodyFontFamily"</item>
<item name="android:lineSpacingExtra">8sp</item>
</style>
diff --git a/java/com/android/dialer/widget/res/layout/text_view_preference.xml b/java/com/android/dialer/widget/res/layout/text_view_preference.xml
index 39b550657..b272ca9cf 100644
--- a/java/com/android/dialer/widget/res/layout/text_view_preference.xml
+++ b/java/com/android/dialer/widget/res/layout/text_view_preference.xml
@@ -19,6 +19,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="16dp"
- android:fontFamily="sans-serif"
+ android:fontFamily="@*android:string/config_bodyFontFamily"
android:linksClickable="true"
android:singleLine="false"/>
diff --git a/java/com/android/incallui/calllocation/impl/res/values/styles.xml b/java/com/android/incallui/calllocation/impl/res/values/styles.xml
index 45e9c98d4..a123367d5 100644
--- a/java/com/android/incallui/calllocation/impl/res/values/styles.xml
+++ b/java/com/android/incallui/calllocation/impl/res/values/styles.xml
@@ -18,30 +18,30 @@
<style name="LocationAddressTitleTextStyle">
<item name="android:textSize">14sp</item>
<item name="android:textColor">#dd000000</item>
- <item name="android:fontFamily">sans-serif-medium</item>
+ <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
</style>
<style name="LocationAddressTextStyle">
<item name="android:textSize">16sp</item>
<item name="android:textColor">#dd000000</item>
- <item name="android:fontFamily">sans-serif</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
</style>
<style name="LocationLatLongTextStyle">
<item name="android:textSize">14sp</item>
<item name="android:textColor">#88000000</item>
- <item name="android:fontFamily">sans-serif</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
</style>
<style name="LocationLoadingTextStyle">
<item name="android:textSize">14sp</item>
<item name="android:textColor">#dd000000</item>
- <item name="android:fontFamily">sans-serif</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
</style>
<style name="LocationErrorTextStyle">
<item name="android:textSize">14sp</item>
<item name="android:textColor">#dd000000</item>
- <item name="android:fontFamily">sans-serif</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
</style>
</resources>
diff --git a/java/com/android/incallui/commontheme/res/values/styles.xml b/java/com/android/incallui/commontheme/res/values/styles.xml
index 464eda5bb..287580fa4 100644
--- a/java/com/android/incallui/commontheme/res/values/styles.xml
+++ b/java/com/android/incallui/commontheme/res/values/styles.xml
@@ -25,7 +25,7 @@
<style name="Dialer.Incall.TextAppearance.Large">
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">36sp</item>
- <item name="android:fontFamily">sans-serif-light</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
</style>
<style name="Dialer.Incall.TextAppearance.Label">
diff --git a/java/com/android/incallui/res/layout/frag_rtt_request_dialog.xml b/java/com/android/incallui/res/layout/frag_rtt_request_dialog.xml
index f0bd1531e..3252c6ced 100644
--- a/java/com/android/incallui/res/layout/frag_rtt_request_dialog.xml
+++ b/java/com/android/incallui/res/layout/frag_rtt_request_dialog.xml
@@ -58,7 +58,7 @@
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:backgroundTint="?android:attr/colorBackgroundFloating"
- android:fontFamily="sans-serif-medium"
+ android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
android:stateListAnimator="@null"
android:text="@string/rtt_button_decline_request"
android:textColor="#757575"/>
@@ -71,7 +71,7 @@
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:backgroundTint="?android:attr/colorPrimary"
- android:fontFamily="sans-serif-medium"
+ android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
android:stateListAnimator="@null"
android:text="@string/rtt_button_accept_request"
android:textColor="@android:color/white"/>
diff --git a/java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml b/java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml
index 065aa8c34..8a5e1f74e 100644
--- a/java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml
+++ b/java/com/android/incallui/rtt/impl/res/layout/rtt_banner.xml
@@ -49,7 +49,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- android:fontFamily="sans-serif-medium"
+ android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
android:includeFontPadding="false"
android:textColor="#FFFFFF"
android:textSize="20sp"
@@ -59,7 +59,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
- android:fontFamily="sans-serif-medium"
+ android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
android:includeFontPadding="false"
android:textColor="#FFFFFF"
android:textSize="14sp"
@@ -93,4 +93,4 @@
android:textColor="#DD000000"
android:textSize="14sp"/>
-</LinearLayout> \ No newline at end of file
+</LinearLayout>
diff --git a/java/com/android/incallui/rtt/impl/res/values/styles.xml b/java/com/android/incallui/rtt/impl/res/values/styles.xml
index 667cd1241..c221e02f3 100644
--- a/java/com/android/incallui/rtt/impl/res/values/styles.xml
+++ b/java/com/android/incallui/rtt/impl/res/values/styles.xml
@@ -17,7 +17,7 @@
<resources>
<style name="Dialer.Incall.TextAppearance.RttMessage" parent="Dialer.Incall.TextAppearance">
- <item name="android:fontFamily">sans-serif</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
<item name="android:textColor">#DD000000</item>
<item name="android:textSize">16sp</item>
</style>
@@ -46,4 +46,4 @@
<item name="android:popupBackground">@drawable/overflow_menu_background</item>
<item name="android:popupElevation">@dimen/rtt_overflow_menu_elevation</item>
</style>
-</resources> \ No newline at end of file
+</resources>
diff --git a/java/com/android/incallui/sessiondata/res/values/styles.xml b/java/com/android/incallui/sessiondata/res/values/styles.xml
index fe217f0aa..8147d98bd 100644
--- a/java/com/android/incallui/sessiondata/res/values/styles.xml
+++ b/java/com/android/incallui/sessiondata/res/values/styles.xml
@@ -17,7 +17,7 @@
<resources>
<style name="Dialer.Incall.TextAppearance.Message" parent="Dialer.Incall.TextAppearance">
- <item name="android:fontFamily">sans-serif</item>
+ <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:textSize">24sp</item>
</style>