commit 6436895d0be0de94461d527f3082dd98cda5cb63
author Edgar Wang <edgarwang@google.com> Mon Apr 13 20:14:59 2020 +0800
committer Edgar Wang <edgarwang@google.com> Wed Apr 15 20:12:21 2020 +0800
tree 44564fc5bd92659f4e528a63dc387bef0e2fc75b
parent 4e2e7bb734dd3d8822b6968c2bd05b9145959307

Make ActionDisabledByAdminDialog can adopt selected font

Bug: 148071683
Test: Robotest & manual
Change-Id: I1123308a5e157a6df84ca277ef9bb720670f1803

res/layout/admin_support_details_dialog.xml

diff --git a/res/layout/admin_support_details_dialog.xml b/res/layout/admin_support_details_dialog.xml
index 66eaf0d..2e126cc 100644
--- a/res/layout/admin_support_details_dialog.xml
+++ b/res/layout/admin_support_details_dialog.xml
@@ -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"

res/values/styles.xml

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 848eaf1..1359bce 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -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>