summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2023-02-10 20:25:02 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-02-10 20:25:02 +0000
commit4df530f5e4b42341a0dfc945244b73356a4031ff (patch)
tree7fff0eba83e72d583fe6ce331f36093a9dccce34 /java
parent031a84bc72c2f8d5483fefc24539bb5ee08d5fdc (diff)
parent348d0e3c51daf6c285c505c227f9aeb35d8a056a (diff)
Merge "Addjust text colors" into tm-qpr-dev
Diffstat (limited to 'java')
-rw-r--r--java/res/layout/chooser_grid_preview_file.xml3
-rw-r--r--java/res/layout/chooser_grid_preview_image.xml3
-rw-r--r--java/res/values/styles.xml6
3 files changed, 8 insertions, 4 deletions
diff --git a/java/res/layout/chooser_grid_preview_file.xml b/java/res/layout/chooser_grid_preview_file.xml
index 94755114..095e5d62 100644
--- a/java/res/layout/chooser_grid_preview_file.xml
+++ b/java/res/layout/chooser_grid_preview_file.xml
@@ -65,7 +65,8 @@
android:ellipsize="middle"
android:gravity="start|top"
android:paddingRight="24dp"
- android:singleLine="true"/>
+ android:singleLine="true"
+ android:textAppearance="@style/TextAppearance.ChooserDefault" />
</LinearLayout>
<TextView
diff --git a/java/res/layout/chooser_grid_preview_image.xml b/java/res/layout/chooser_grid_preview_image.xml
index 614d9b5e..792b7d4d 100644
--- a/java/res/layout/chooser_grid_preview_image.xml
+++ b/java/res/layout/chooser_grid_preview_image.xml
@@ -55,7 +55,8 @@
android:maxLines="6"
android:ellipsize="end"
android:linksClickable="false"
- android:visibility="gone" />
+ android:visibility="gone"
+ android:textAppearance="@style/TextAppearance.ChooserDefault" />
</LinearLayout>
<TextView
diff --git a/java/res/values/styles.xml b/java/res/values/styles.xml
index 229512fa..ba6418a8 100644
--- a/java/res/values/styles.xml
+++ b/java/res/values/styles.xml
@@ -47,9 +47,11 @@
<item name="*android:iconfactoryBadgeSize">@dimen/chooser_badge_size</item>
</style>
- <style name="ReselectionAction">
+ <style name="TextAppearance.ChooserDefault"
+ parent="@android:style/TextAppearance.DeviceDefault" />
+
+ <style name="ReselectionAction" parent="TextAppearance.ChooserDefault">
<item name="android:paddingTop">5dp</item>
<item name="android:paddingBottom">5dp</item>
- <item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
</resources>