summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2019-05-01 13:41:31 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-05-01 13:41:31 +0000
commitcbfed3f03dcdd6d33da14098447da0a411ab0e5f (patch)
tree71a1936136736586ce7f6feac1842c1ddda525a7
parentdf7e984cc3b2bbc0e9fef03637c4084f3fcb41c0 (diff)
parent66db80910e9a2329c91fa5f1cbe911638b4e5999 (diff)
Merge "Sharesheet - Font updates" into qt-dev
-rw-r--r--core/res/res/layout/chooser_grid.xml4
-rw-r--r--core/res/res/layout/chooser_grid_preview_text.xml5
2 files changed, 4 insertions, 5 deletions
diff --git a/core/res/res/layout/chooser_grid.xml b/core/res/res/layout/chooser_grid.xml
index 99053600f8e7..17b5f50669a2 100644
--- a/core/res/res/layout/chooser_grid.xml
+++ b/core/res/res/layout/chooser_grid.xml
@@ -46,9 +46,7 @@
<TextView android:id="@+id/title"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:textAppearance="?attr/textAppearanceMedium"
- android:textSize="20sp"
- android:textColor="?attr/textColorPrimary"
+ android:textAppearance="@style/TextAppearance.DeviceDefault.WindowTitle"
android:gravity="center"
android:paddingBottom="@dimen/chooser_view_spacing"
android:paddingLeft="24dp"
diff --git a/core/res/res/layout/chooser_grid_preview_text.xml b/core/res/res/layout/chooser_grid_preview_text.xml
index f3ca0af767b1..e889e8584fec 100644
--- a/core/res/res/layout/chooser_grid_preview_text.xml
+++ b/core/res/res/layout/chooser_grid_preview_text.xml
@@ -44,6 +44,7 @@
android:layout_toStartOf="@id/copy_button"
android:layout_centerVertical="true"
android:ellipsize="end"
+ android:fontFamily="@android:string/config_headlineFontFamily"
android:textColor="?android:attr/textColorPrimary"
android:maxLines="2"/>
@@ -112,8 +113,8 @@
android:layout_gravity="center_vertical"
android:ellipsize="end"
android:maxLines="2"
- android:textSize="20sp"
- android:textColor="?android:attr/textColorPrimary"/>
+ android:textAppearance="@style/TextAppearance.DeviceDefault.WindowTitle"
+ android:fontFamily="@android:string/config_headlineFontFamily"/>
</LinearLayout>
</LinearLayout>