Settings: Use font configs instead fonts directly
Change-Id: I2c93301a7a9aa640278c62912ee6a54dbe29589c Signed-off-by: Pranav Vashi <neobuddy89@gmail.com> Signed-off-by: AnierinB <anierin@evolution-x.org>
This commit is contained in:
@@ -18,7 +18,7 @@
|
|||||||
android:id="@+id/conversation_icon"
|
android:id="@+id/conversation_icon"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:fontFamily="sans-serif"
|
android:fontFamily="@*android:string/config_bodyFontFamilyMedium"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
android:textSize="@dimen/conversation_message_contact_icon_text_size"
|
android:textSize="@dimen/conversation_message_contact_icon_text_size"
|
||||||
android:gravity="center" />
|
android:gravity="center" />
|
||||||
|
|||||||
@@ -22,7 +22,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="?android:attr/selectableItemBackground"
|
android:background="?android:attr/selectableItemBackground"
|
||||||
android:ellipsize="end"
|
android:ellipsize="end"
|
||||||
android:fontFamily="sans-serif-medium"
|
android:fontFamily="@*android:string/config_headlineFontFamily"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
android:padding="@dimen/pager_tabs_title_padding"
|
android:padding="@dimen/pager_tabs_title_padding"
|
||||||
|
|||||||
@@ -288,7 +288,7 @@
|
|||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="TextAppearance.ZenOnboardingButton">
|
<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:textSize">14sp</item>
|
||||||
<item name="android:textColor">?android:attr/colorAccent</item>
|
<item name="android:textColor">?android:attr/colorAccent</item>
|
||||||
<item name="android:background">@*android:drawable/btn_borderless_rect</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:layout_marginBottom">36dp</item>
|
||||||
<item name="android:textSize">16sp</item>
|
<item name="android:textSize">16sp</item>
|
||||||
<item name="android:textColor">?android:attr/textColorPrimary</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>
|
<item name="android:gravity">start</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
@@ -785,7 +785,7 @@
|
|||||||
<item name="android:layout_height">wrap_content</item>
|
<item name="android:layout_height">wrap_content</item>
|
||||||
<item name="android:textSize">16sp</item>
|
<item name="android:textSize">16sp</item>
|
||||||
<item name="android:textColor">?android:attr/textColorPrimary</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>
|
<item name="android:gravity">start</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
@@ -794,7 +794,7 @@
|
|||||||
<item name="android:layout_height">wrap_content</item>
|
<item name="android:layout_height">wrap_content</item>
|
||||||
<item name="android:textSize">14sp</item>
|
<item name="android:textSize">14sp</item>
|
||||||
<item name="android:textColor">?android:attr/textColorSecondary</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>
|
<item name="android:gravity">start</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ public class DataUsageSummaryPreference extends Preference {
|
|||||||
private static final long WARNING_AGE = TimeUnit.HOURS.toMillis(6L);
|
private static final long WARNING_AGE = TimeUnit.HOURS.toMillis(6L);
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
static final Typeface SANS_SERIF_MEDIUM =
|
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 boolean mChartEnabled = true;
|
||||||
private CharSequence mStartLabel;
|
private CharSequence mStartLabel;
|
||||||
@@ -265,7 +265,7 @@ public class DataUsageSummaryPreference extends Preference {
|
|||||||
|
|
||||||
if (updateAgeMillis <= WARNING_AGE) {
|
if (updateAgeMillis <= WARNING_AGE) {
|
||||||
setCarrierInfoTextStyle(
|
setCarrierInfoTextStyle(
|
||||||
carrierInfo, android.R.attr.textColorSecondary, Typeface.SANS_SERIF);
|
carrierInfo, android.R.attr.textColorSecondary, Typeface.DEFAULT);
|
||||||
} else {
|
} else {
|
||||||
setCarrierInfoTextStyle(carrierInfo, android.R.attr.colorError, SANS_SERIF_MEDIUM);
|
setCarrierInfoTextStyle(carrierInfo, android.R.attr.colorError, SANS_SERIF_MEDIUM);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -178,7 +178,7 @@ public class StorageWizardInit extends StorageWizardBase {
|
|||||||
private Spannable styleFont(String text) {
|
private Spannable styleFont(String text) {
|
||||||
Spannable s = (Spannable) Html.fromHtml(text);
|
Spannable s = (Spannable) Html.fromHtml(text);
|
||||||
for (URLSpan span : s.getSpans(0, s.length(), URLSpan.class)) {
|
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);
|
s.setSpan(typefaceSpan, s.getSpanStart(span), s.getSpanEnd(span), 0);
|
||||||
}
|
}
|
||||||
return s;
|
return s;
|
||||||
|
|||||||
Reference in New Issue
Block a user