Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: Use font configs instead fonts directly

Browse Source 
Change-Id: I2c93301a7a9aa640278c62912ee6a54dbe29589c
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
Signed-off-by: AnierinB <anierin@evolution-x.org>
This commit is contained in:
Pranav Vashi
2021-12-06 00:54:11 +05:30
committed by Joey
parent ddcf4dad63
commit 9051e97b8c
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/conversation_message_icon.xml
View File

@@ -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" />

2
res/layout/sliding_tab_title_view.xml
View File

@@ -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"

8
res/values/styles.xml
View File

@@ -288,7 +288,7 @@
</style>
<style name="TextAppearance.ZenOnboardingButton">
<item name="android:fontFamily">sans-serif-medium</item>
<item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>
<item name="android:textSize">14sp</item>
<item name="android:textColor">?android:attr/colorAccent</item>
<item name="android:background">@*android:drawable/btn_borderless_rect</item>
@@ -769,7 +769,7 @@
<item name="android:layout_marginBottom">36dp</item>
<item name="android:textSize">16sp</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>
<item name="android:gravity">start</item>
</style>
@@ -785,7 +785,7 @@
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">16sp</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>
<item name="android:gravity">start</item>
</style>
@@ -794,7 +794,7 @@
<item name="android:layout_height">wrap_content</item>
<item name="android:textSize">14sp</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
<item name="android:fontFamily">sans-serif</item>
<item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>
<item name="android:gravity">start</item>
</style>

4
src/com/android/settings/datausage/DataUsageSummaryPreference.java
View File

@@ -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);
}

2
src/com/android/settings/deviceinfo/StorageWizardInit.java
View File

@@ -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;