summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Alan Chen <alanschen@google.com> 2024-05-31 15:17:58 -0700
committer Alan Chen <alanschen@google.com> 2024-06-05 11:41:36 -0700
commitbfcacd5d569f4b0d6c4b750fde318b982bc19b05 (patch)
tree57d8380305019203ce2f0a1a345e1d32617c9a62
parentb4f32dac1da25d614f3ef284ab499a4577177372 (diff)
Move some TextView textSize to dimens.xml
Move textSizes to be defined in dimens.xml so that other AndroidRROs may overlay these values without modifying IntentResolver source code. Bug: 325636691 Test: manual, no UI change as expected Change-Id: Iad2b25fe90c3ba652a63265839d8be191f8a3ce9
-rw-r--r--java/res/layout/chooser_action_view.xml2
-rw-r--r--java/res/layout/chooser_grid_item.xml4
-rw-r--r--java/res/layout/chooser_headline_row.xml2
-rw-r--r--java/res/layout/resolve_grid_item.xml4
-rw-r--r--java/res/values/dimens.xml4
5 files changed, 10 insertions, 6 deletions
diff --git a/java/res/layout/chooser_action_view.xml b/java/res/layout/chooser_action_view.xml
index d045a7e3..6177821a 100644
--- a/java/res/layout/chooser_action_view.xml
+++ b/java/res/layout/chooser_action_view.xml
@@ -28,4 +28,4 @@
android:gravity="center"
android:maxLines="1"
android:textColor="?androidprv:attr/materialColorOnSurface"
- android:textSize="12sp" />
+ android:textSize="@dimen/chooser_action_view_text_size" />
diff --git a/java/res/layout/chooser_grid_item.xml b/java/res/layout/chooser_grid_item.xml
index 18abc7bc..547a9944 100644
--- a/java/res/layout/chooser_grid_item.xml
+++ b/java/res/layout/chooser_grid_item.xml
@@ -51,14 +51,14 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?androidprv:attr/materialColorOnSurface"
- android:textSize="12sp"
+ android:textSize="@dimen/chooser_grid_target_name_text_size"
android:maxLines="1"
android:ellipsize="end" />
<!-- Activity name if set, gone for Direct Share targets -->
<TextView android:id="@android:id/text2"
android:textAppearance="?android:attr/textAppearanceSmall"
- android:textSize="12sp"
+ android:textSize="@dimen/chooser_grid_activity_name_text_size"
android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/java/res/layout/chooser_headline_row.xml b/java/res/layout/chooser_headline_row.xml
index bfce7473..01be653f 100644
--- a/java/res/layout/chooser_headline_row.xml
+++ b/java/res/layout/chooser_headline_row.xml
@@ -35,7 +35,7 @@
app:layout_constrainedWidth="true"
style="@style/TextAppearance.ChooserDefault"
android:fontFamily="@androidprv:string/config_headlineFontFamily"
- android:textSize="18sp"
+ android:textSize="@dimen/chooser_headline_text_size"
/>
<TextView
diff --git a/java/res/layout/resolve_grid_item.xml b/java/res/layout/resolve_grid_item.xml
index 25088773..e5a00429 100644
--- a/java/res/layout/resolve_grid_item.xml
+++ b/java/res/layout/resolve_grid_item.xml
@@ -50,7 +50,7 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?androidprv:attr/materialColorOnSurface"
- android:textSize="12sp"
+ android:textSize="@dimen/chooser_grid_target_name_text_size"
android:gravity="top|center_horizontal"
android:maxLines="1"
android:ellipsize="end" />
@@ -58,7 +58,7 @@
<!-- Activity name if set, gone for Direct Share targets -->
<TextView android:id="@android:id/text2"
android:textAppearance="?android:attr/textAppearanceSmall"
- android:textSize="12sp"
+ android:textSize="@dimen/chooser_grid_activity_name_text_size"
android:textColor="?androidprv:attr/materialColorOnSurfaceVariant"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index bd868c9f..a1f03276 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -34,6 +34,9 @@
<dimen name="chooser_max_collapsed_height">288dp</dimen>
<dimen name="chooser_icon_size">56dp</dimen>
<dimen name="chooser_badge_size">22dp</dimen>
+ <dimen name="chooser_headline_text_size">18sp</dimen>
+ <dimen name="chooser_grid_target_name_text_size">12sp</dimen>
+ <dimen name="chooser_grid_activity_name_text_size">12sp</dimen>
<dimen name="resolver_icon_size">32dp</dimen>
<dimen name="resolver_button_bar_spacing">0dp</dimen>
<dimen name="resolver_badge_size">18dp</dimen>
@@ -51,6 +54,7 @@
<dimen name="resolver_empty_state_container_padding_bottom">8dp</dimen>
<dimen name="resolver_profile_tab_margin">4dp</dimen>
<dimen name="chooser_action_view_icon_size">22dp</dimen>
+ <dimen name="chooser_action_view_text_size">12sp</dimen>
<dimen name="chooser_action_margin">0dp</dimen>
<dimen name="modify_share_text_toggle_max_width">150dp</dimen>
<dimen name="chooser_view_spacing">16dp</dimen>