summaryrefslogtreecommitdiff
path: root/res/layout
diff options
context:
space:
mode:
author Zemiao Zhu <zemiao@google.com> 2021-04-16 15:36:02 -0700
committer Zemiao Zhu <zemiao@google.com> 2021-05-11 21:47:29 +0000
commit2e499fb8d04bb67a5d621716797c19f9d49df93d (patch)
tree3b3f40dcda25907c1f1003b58417daf17160e70a /res/layout
parent5a0b5e73ad176dbeec196bb718a43a165b4eb2b7 (diff)
Update typography to use TextAppearance.DeviceDefault, which is
inheriting from TextAppearance.Material but with overlay-configured fonts. Bug: 185625942 Test: manual Change-Id: Ie04e9039fe99bf7a01c48077a85340800d650d1a
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/dialog_delete_confirmation.xml2
-rw-r--r--res/layout/drag_shadow_layout.xml2
-rw-r--r--res/layout/item_doc_grid.xml4
-rw-r--r--res/layout/item_doc_list.xml2
4 files changed, 5 insertions, 5 deletions
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>