diff --git a/res/layout/conversation_message_icon.xml b/res/layout/conversation_message_icon.xml
index 9f9f0ac76e8..eefee8ae7f5 100644
--- a/res/layout/conversation_message_icon.xml
+++ b/res/layout/conversation_message_icon.xml
@@ -18,7 +18,7 @@
android:id="@+id/conversation_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:fontFamily="sans-serif"
+ android:fontFamily="@*android:string/config_bodyFontFamilyMedium"
android:textStyle="bold"
android:textSize="@dimen/conversation_message_contact_icon_text_size"
android:gravity="center" />
diff --git a/res/layout/sliding_tab_title_view.xml b/res/layout/sliding_tab_title_view.xml
index 5dead026365..35737e5af50 100644
--- a/res/layout/sliding_tab_title_view.xml
+++ b/res/layout/sliding_tab_title_view.xml
@@ -22,7 +22,7 @@
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:ellipsize="end"
- android:fontFamily="sans-serif-medium"
+ android:fontFamily="@*android:string/config_headlineFontFamily"
android:gravity="center"
android:maxLines="1"
android:padding="@dimen/pager_tabs_title_padding"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 9f1df7d9095..a60694c9cba 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -288,7 +288,7 @@
@@ -785,7 +785,7 @@
- wrap_content
- 16sp
- ?android:attr/textColorPrimary
- - sans-serif
+ - @*android:string/config_bodyFontFamilyMedium
- start
@@ -794,7 +794,7 @@
- wrap_content
- 14sp
- ?android:attr/textColorSecondary
- - sans-serif
+ - @*android:string/config_bodyFontFamilyMedium
- start
diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java
index 92c9163ddc0..ff7eb66a1c4 100644
--- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java
+++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java
@@ -57,7 +57,7 @@ public class DataUsageSummaryPreference extends Preference {
private static final long WARNING_AGE = TimeUnit.HOURS.toMillis(6L);
@VisibleForTesting
static final Typeface SANS_SERIF_MEDIUM =
- Typeface.create("sans-serif-medium", Typeface.NORMAL);
+ Typeface.create("@*android:string/config_bodyFontFamilyMedium", Typeface.NORMAL);
private boolean mChartEnabled = true;
private CharSequence mStartLabel;
@@ -265,7 +265,7 @@ public class DataUsageSummaryPreference extends Preference {
if (updateAgeMillis <= WARNING_AGE) {
setCarrierInfoTextStyle(
- carrierInfo, android.R.attr.textColorSecondary, Typeface.SANS_SERIF);
+ carrierInfo, android.R.attr.textColorSecondary, Typeface.DEFAULT);
} else {
setCarrierInfoTextStyle(carrierInfo, android.R.attr.colorError, SANS_SERIF_MEDIUM);
}
diff --git a/src/com/android/settings/deviceinfo/StorageWizardInit.java b/src/com/android/settings/deviceinfo/StorageWizardInit.java
index 17ab4e73d4f..5e4da056cc5 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardInit.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardInit.java
@@ -178,7 +178,7 @@ public class StorageWizardInit extends StorageWizardBase {
private Spannable styleFont(String text) {
Spannable s = (Spannable) Html.fromHtml(text);
for (URLSpan span : s.getSpans(0, s.length(), URLSpan.class)) {
- TypefaceSpan typefaceSpan = new TypefaceSpan("sans-serif-medium");
+ TypefaceSpan typefaceSpan = new TypefaceSpan("@*android:string/config_bodyFontFamilyMedium");
s.setSpan(typefaceSpan, s.getSpanStart(span), s.getSpanEnd(span), 0);
}
return s;