Update typography to use TextAppearance.DeviceDefault, which is

inheriting from TextAppearance.Material but with overlay-configured
fonts.

Bug: 185625942
Test: manual
Change-Id: Ie04e9039fe99bf7a01c48077a85340800d650d1a

7 files changed, 19 insertions, 17 deletions

diff --git a/res/layout-sw720dp/item_doc_list.xml b/res/layout-sw720dp/item_doc_list.xml
index 5849a31e9..cf74909e9 100644
--- a/res/layout-sw720dp/item_doc_list.xml
+++ b/res/layout-sw720dp/item_doc_list.xml
@@ -110,7 +110,7 @@
                     android:ellipsize="middle"
                     android:singleLine="true"
                     android:textAlignment="viewStart"
-                    android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+                    android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
                     android:textColor="?android:attr/textColorPrimary"/>
             </LinearLayout>
 
@@ -123,7 +123,7 @@
                 android:ellipsize="end"
                 android:singleLine="true"
                 android:textAlignment="viewStart"
-                android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
                 android:textColor="?android:attr/textColorSecondary" />
 
             <TextView
@@ -136,7 +136,7 @@
                 android:minWidth="70dp"
                 android:singleLine="true"
                 android:textAlignment="viewEnd"
-                android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
                 android:textColor="?android:attr/textColorSecondary" />
 
             <TextView
@@ -149,7 +149,7 @@
                 android:minWidth="70dp"
                 android:singleLine="true"
                 android:textAlignment="viewEnd"
-                android:textAppearance="@android:style/TextAppearance.Material.Body1"
+                android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
                 android:textColor="?android:attr/textColorSecondary" />
         </LinearLayout>
 
diff --git a/res/layout-sw720dp/shared_cell_content.xml b/res/layout-sw720dp/shared_cell_content.xml
index 2a811f94e..dc37f2cfe 100644
--- a/res/layout-sw720dp/shared_cell_content.xml
+++ b/res/layout-sw720dp/shared_cell_content.xml
@@ -23,7 +23,7 @@
         android:ellipsize="end"
         android:singleLine="true"
         android:textAlignment="viewStart"
-        android:textAppearance="@style/android:TextAppearance.Material.Subhead"
+        android:textAppearance="@*style/android:TextAppearance.DeviceDefault.Subhead"
         android:textColor="?android:attr/textColorSecondary"/>
 
     <ImageView
diff --git a/res/layout/dialog_delete_confirmation.xml b/res/layout/dialog_delete_confirmation.xml
index 501736cec..d5b133ee8 100644
--- a/res/layout/dialog_delete_confirmation.xml
+++ b/res/layout/dialog_delete_confirmation.xml
@@ -21,5 +21,5 @@
     android:paddingTop="24dp"
     android:paddingStart="24dp"
     android:paddingEnd="24dp"
-    android:textAppearance="@android:style/TextAppearance.Material.Subhead">
+    android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead">
 </TextView>
diff --git a/res/layout/drag_shadow_layout.xml b/res/layout/drag_shadow_layout.xml
index f42474254..75bd0ca28 100644
--- a/res/layout/drag_shadow_layout.xml
+++ b/res/layout/drag_shadow_layout.xml
@@ -40,7 +40,7 @@
             android:maxLines="1"
             android:ellipsize="end"
             android:textAlignment="viewStart"
-            android:textAppearance="@android:style/TextAppearance.Material.Subhead"
+            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
             android:paddingStart="6dp"
             android:paddingBottom="1dp"/>
 
diff --git a/res/layout/item_doc_grid.xml b/res/layout/item_doc_grid.xml
index 7b025419f..3d1a976b9 100644
--- a/res/layout/item_doc_grid.xml
+++ b/res/layout/item_doc_grid.xml
@@ -176,7 +176,7 @@
                         android:singleLine="true"
                         android:ellipsize="end"
                         android:textAlignment="viewStart"
-                        android:textAppearance="@android:style/TextAppearance.Material.Caption"/>
+                        android:textAppearance="@style/ItemCaptionText" />
 
                     <TextView
                         android:id="@+id/date"
@@ -187,7 +187,7 @@
                         android:singleLine="true"
                         android:ellipsize="end"
                         android:textAlignment="viewStart"
-                        android:textAppearance="@android:style/TextAppearance.Material.Caption"/>
+                        android:textAppearance="@style/ItemCaptionText" />
 
                 </RelativeLayout>
 
diff --git a/res/layout/item_doc_list.xml b/res/layout/item_doc_list.xml
index bcc624808..0942c4b5f 100644
--- a/res/layout/item_doc_list.xml
+++ b/res/layout/item_doc_list.xml
@@ -126,7 +126,7 @@
               android:layout_height="wrap_content"
               android:ellipsize="end"
               android:singleLine="true"
-              android:textAppearance="@style/ItemDocListCaptionText" />
+              android:textAppearance="@style/ItemCaptionText" />
 
         </LinearLayout>
 
diff --git a/res/values/styles_text.xml b/res/values/styles_text.xml
index 0edaca6ae..5ea6f520f 100644
--- a/res/values/styles_text.xml
+++ b/res/values/styles_text.xml
@@ -53,35 +53,36 @@
     <style name="CardPrimaryText" parent="@style/TextAppearance.AppCompat.Subhead">
         <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:textSize">14sp</item>
+        <item name="fontFamily">@string/config_fontFamily</item>
     </style>
 
     <style name="ActionModeTitle" parent="@style/ToolbarTitle">
         <item name="android:textSize">@dimen/action_mode_text_size</item>
     </style>
 
-    <style name="ToolbarTitle" parent="@android:style/TextAppearance.Material.Title">
+    <style name="ToolbarTitle" parent="@*android:style/TextAppearance.DeviceDefault.Title">
         <item name="fontFamily">@string/config_fontFamilyMedium</item>
     </style>
 
-    <style name="DrawerMenuTitle" parent="@android:style/TextAppearance.Material.Title">
+    <style name="DrawerMenuTitle" parent="@*android:style/TextAppearance.DeviceDefault.Title">
         <item name="android:textSize">24sp</item>
         <item name="fontFamily">@string/config_fontFamilyMedium</item>
     </style>
 
-    <style name="DrawerMenuHeader" parent="@android:style/TextAppearance.Material.Subhead">
+    <style name="DrawerMenuHeader" parent="@*android:style/TextAppearance.DeviceDefault.Subhead">
         <item name="android:textColor">?android:attr/textColorSecondary</item>
         <item name="android:textAllCaps">true</item>
         <item name="android:textSize">11sp</item>
         <item name="fontFamily">@string/config_fontFamilyMedium</item>
     </style>
 
-    <style name="DrawerMenuPrimary" parent="android:style/TextAppearance.Material.Body2">
+    <style name="DrawerMenuPrimary" parent="*android:style/TextAppearance.DeviceDefault.Body2">
         <item name="android:textSize">14sp</item>
         <item name="android:textColor">@color/item_root_primary_text</item>
         <item name="fontFamily">@string/config_fontFamilyMedium</item>
     </style>
 
-    <style name="DrawerMenuSecondary" parent="android:style/TextAppearance.Material.Body2">
+    <style name="DrawerMenuSecondary" parent="*android:style/TextAppearance.DeviceDefault.Body2">
         <item name="android:textSize">12sp</item>
         <item name="android:textColor">@color/item_root_secondary_text</item>
     </style>
@@ -118,13 +119,14 @@
         <item name="fontFamily">@string/config_fontFamilyMedium</item>
     </style>
 
-    <style name="TabTextAppearance" parent="@android:style/TextAppearance.DeviceDefault.Medium">
+    <style name="TabTextAppearance" parent="@*android:style/TextAppearance.DeviceDefault.Medium">
         <item name="android:textSize">14sp</item>
         <item name="fontFamily">@string/config_fontFamilyMedium</item>
     </style>
 
-    <style name="ItemDocListCaptionText" parent="@android:style/TextAppearance.Material.Caption">
+    <style name="ItemCaptionText" parent="@*android:style/TextAppearance.DeviceDefault.Caption">
         <item name="android:textColor">@color/doc_list_item_subtitle_color</item>
+        <item name="fontFamily">@string/config_fontFamily</item>
     </style>
 
 </resources>
\ No newline at end of file