PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make ActionDisabledByAdminDialog can adopt selected font

Browse Source 
Bug: 148071683
Test: Robotest & manual
Change-Id: I1123308a5e157a6df84ca277ef9bb720670f1803
This commit is contained in:
Edgar Wang
2020-04-13 20:14:59 +08:00
parent 4e2e7bb734
commit 6436895d0b
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/admin_support_details_dialog.xml
View File

@@ -34,7 +34,7 @@
android:layout_height="wrap_content"
android:paddingStart="@dimen/admin_details_dialog_padding"
android:text="@string/disabled_by_policy_title"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Title" />
android:textAppearance="@style/TextAppearance.HeadLineFontFamily"/>
</LinearLayout>
<ScrollView
@@ -48,7 +48,7 @@
<TextView android:id="@+id/admin_support_msg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
android:textAppearance="@style/TextAppearance.HeadLineFontFamily.Subhead"
android:text="@string/default_admin_support_msg"
android:maxLength="200"
android:autoLink="email|phone|web"

10
res/values/styles.xml
View File

@@ -733,4 +733,14 @@
<item name="android:fontFamily">sans-serif</item>
<item name="android:gravity">start</item>
</style>
<style name="TextAppearance.HeadLineFontFamily"
parent="@*android:style/TextAppearance.DeviceDefault.Title">
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
</style>
<style name="TextAppearance.HeadLineFontFamily.Subhead"
parent="@*android:style/TextAppearance.DeviceDefault.Subhead">
<item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
</style>
</resources>