summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Joy Babafemi <jbabs@google.com> 2024-01-30 17:53:37 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2024-01-30 17:53:37 +0000
commita631162bd7184ac65aeac37fd579ac64b88a79be (patch)
treed9a821bf578f44aaf6a9d3680d56973a0d214290
parent33ca55d67943769e5ef43a4851f3cc56e00ba070 (diff)
parent0011e80e7dc7f7c13139c4ead1efd7b0ffc5fb42 (diff)
Merge "Add minimum touch target to dropdown and fix strings for talkback annoucement" into main
-rw-r--r--packages/CredentialManager/res/layout/credman_dropdown_bottom_sheet.xml1
-rw-r--r--packages/CredentialManager/res/layout/credman_dropdown_presentation_layout.xml3
-rw-r--r--packages/CredentialManager/res/values/dimens.xml1
3 files changed, 4 insertions, 1 deletions
diff --git a/packages/CredentialManager/res/layout/credman_dropdown_bottom_sheet.xml b/packages/CredentialManager/res/layout/credman_dropdown_bottom_sheet.xml
index 929756cdf9cc..b97e9927e0ed 100644
--- a/packages/CredentialManager/res/layout/credman_dropdown_bottom_sheet.xml
+++ b/packages/CredentialManager/res/layout/credman_dropdown_bottom_sheet.xml
@@ -17,6 +17,7 @@
android:id="@android:id/content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:minWidth="@dimen/dropdown_touch_target_min_width"
android:orientation="horizontal"
android:layout_marginEnd="@dimen/dropdown_layout_horizontal_margin"
android:elevation="3dp">
diff --git a/packages/CredentialManager/res/layout/credman_dropdown_presentation_layout.xml b/packages/CredentialManager/res/layout/credman_dropdown_presentation_layout.xml
index 1fe5e0ed41f9..261154fe9792 100644
--- a/packages/CredentialManager/res/layout/credman_dropdown_presentation_layout.xml
+++ b/packages/CredentialManager/res/layout/credman_dropdown_presentation_layout.xml
@@ -17,6 +17,7 @@
android:id="@android:id/content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:minWidth="@dimen/dropdown_touch_target_min_width"
android:layout_marginEnd="@dimen/dropdown_layout_horizontal_margin"
android:elevation="3dp">
@@ -24,7 +25,7 @@
android:id="@android:id/icon1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:contentDescription="@string/provider_icon_content_description"
+ android:contentDescription="@string/dropdown_presentation_more_sign_in_options_text"
android:layout_centerVertical="true"
android:layout_alignParentStart="true"
android:background="@null"/>
diff --git a/packages/CredentialManager/res/values/dimens.xml b/packages/CredentialManager/res/values/dimens.xml
index 3a8c78f6d854..53852cbd0d10 100644
--- a/packages/CredentialManager/res/values/dimens.xml
+++ b/packages/CredentialManager/res/values/dimens.xml
@@ -27,4 +27,5 @@
<dimen name="autofill_dropdown_textview_max_width">230dp</dimen>
<dimen name="dropdown_layout_horizontal_margin">24dp</dimen>
<integer name="autofill_max_visible_datasets">3</integer>
+ <dimen name="dropdown_touch_target_min_width">48dp</dimen>
</resources> \ No newline at end of file