summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
author Matt Casey <mrcasey@google.com> 2023-04-28 00:59:44 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-04-28 00:59:44 +0000
commit88b854ecebd3662984a893636a2fe57c5796f6c7 (patch)
tree303634fcdf534a1f1c8247d6f123a372031c258a /java
parentf5c207adda4e8d018598278301b75499d0b45cc7 (diff)
parenta4cac30930d70d3694e880d31ab48ff03d3bb82a (diff)
Merge "Limit the width of the modify share action." into udc-dev
Diffstat (limited to 'java')
-rw-r--r--java/res/layout/chooser_headline_row.xml4
-rw-r--r--java/res/values-sw600dp/dimens.xml1
-rw-r--r--java/res/values/dimens.xml1
3 files changed, 6 insertions, 0 deletions
diff --git a/java/res/layout/chooser_headline_row.xml b/java/res/layout/chooser_headline_row.xml
index 997887d1..5074d5bc 100644
--- a/java/res/layout/chooser_headline_row.xml
+++ b/java/res/layout/chooser_headline_row.xml
@@ -49,7 +49,10 @@
android:id="@+id/reselection_action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:maxWidth="@dimen/modify_share_text_toggle_max_width"
app:layout_constraintEnd_toEndOf="parent"
+ android:maxLines="2"
+ android:ellipsize="end"
android:visibility="gone"
android:paddingTop="3dp"
android:paddingBottom="16dp"
@@ -63,6 +66,7 @@
android:id="@+id/include_text_action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:maxWidth="@dimen/modify_share_text_toggle_max_width"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/reselection_action"
android:layout_alignWithParentIfMissing="true"
diff --git a/java/res/values-sw600dp/dimens.xml b/java/res/values-sw600dp/dimens.xml
index fc8ac066..240ee067 100644
--- a/java/res/values-sw600dp/dimens.xml
+++ b/java/res/values-sw600dp/dimens.xml
@@ -19,4 +19,5 @@
-->
<resources>
<dimen name="chooser_width">624dp</dimen>
+ <dimen name="modify_share_text_toggle_max_width">250dp</dimen>
</resources>
diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index 64f21800..30b788a9 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -51,6 +51,7 @@
<dimen name="resolver_profile_tab_margin">4dp</dimen>
<dimen name="chooser_action_view_icon_size">22dp</dimen>
<dimen name="chooser_action_margin">0dp</dimen>
+ <dimen name="modify_share_text_toggle_max_width">150dp</dimen>
<!-- Note that the values in this section are for landscape phones. For screen configs taller
than 480dp, the values are set in values-h480dp/dimens.xml -->