summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2023-02-10 21:30:04 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-02-10 21:30:04 +0000
commite77189117bc379f4d44c81b4313802fb94842658 (patch)
treeba4572e0d1a30521142fe5801d32028b0211ef19 /java
parentb9fb4295e3a7b63b721b169ca8adf9e06951d8a3 (diff)
parent4df530f5e4b42341a0dfc945244b73356a4031ff (diff)
Merge "Addjust text colors" into tm-qpr-dev am: 4df530f5e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/21358871 Change-Id: I2737a7685820047cb217ac9814fd72a099fb6e43 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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>