Commit 23f60c7c authored by Boris Sazonov's avatar Boris Sazonov Committed by Commit Bot

[TouchToFill][Android] Update layout again and add illustration

Adds XML illustration to TouchToFill bottom sheet and updates the layout
to match the mocks.
Screenshots: https://crbug.com/1009331#c12.

Bug: 1009331
Change-Id: I3d274542cef1ae8ab5ee743d7292ccf78988b892
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1847282
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Reviewed-by: default avatarFriedrich [CET] <fhorschig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703741}
parent 6511b5be
...@@ -41,11 +41,4 @@ ...@@ -41,11 +41,4 @@
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/TextAppearance.BlackBody" /> android:textAppearance="@style/TextAppearance.BlackBody" />
</LinearLayout> </LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.BlueButtonText2"
android:text="@string/touch_to_fill_use_credential"/>
</LinearLayout> </LinearLayout>
...@@ -18,11 +18,18 @@ ...@@ -18,11 +18,18 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp" android:layout_marginTop="6dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="6dp"
android:importantForAccessibility="no" android:importantForAccessibility="no"
app:srcCompat="@drawable/drag_handlebar" /> app:srcCompat="@drawable/drag_handlebar" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:importantForAccessibility="no"
app:srcCompat="@drawable/touch_to_fill_header_image" />
<org.chromium.ui.widget.TextViewWithLeading <org.chromium.ui.widget.TextViewWithLeading
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -42,8 +49,7 @@ ...@@ -42,8 +49,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:divider="@null" android:divider="@null"
android:dividerHeight="6dp" android:dividerHeight="8dp"
android:paddingTop="16dp" android:paddingTop="16dp"
android:paddingBottom="16dp"
tools:listitem="@layout/touch_to_fill_credential_item"/> tools:listitem="@layout/touch_to_fill_credential_item"/>
</LinearLayout> </LinearLayout>
...@@ -108,10 +108,10 @@ ...@@ -108,10 +108,10 @@
<messages fallback_to_english="true"> <messages fallback_to_english="true">
<!-- Touch To Fill --> <!-- Touch To Fill -->
<message name="IDS_TOUCH_TO_FILL_SHEET_TITLE" desc="Header for Touch To Fill sheet where users can pick a credential to fill into a form to."> <message name="IDS_TOUCH_TO_FILL_SHEET_TITLE" desc="Header for Touch To Fill sheet where users can pick a credential to fill into a form to.">
Pick your account Choose an account
</message> </message>
<message name="IDS_TOUCH_TO_FILL_SHEET_SUBTITLE" desc="Subtitle for Touch To Fill sheet where users can pick a credential to fill into a form to."> <message name="IDS_TOUCH_TO_FILL_SHEET_SUBTITLE" desc="Subtitle for Touch To Fill sheet where users can pick a credential to fill into a form to.">
Sign in to <ph name="SITE_NAME">%1$s<ex>airbnb.com</ex></ph> using Chrome for <ph name="SITE_NAME">%1$s<ex>airbnb.com</ex></ph>
</message> </message>
<message name="IDS_TOUCH_TO_FILL_CONTENT_DESCRIPTION" desc="Accessibility string read when the Touch To Fill bottom sheet is opened. It describes the bottom sheet where a user can pick a credential to fill into a password form."> <message name="IDS_TOUCH_TO_FILL_CONTENT_DESCRIPTION" desc="Accessibility string read when the Touch To Fill bottom sheet is opened. It describes the bottom sheet where a user can pick a credential to fill into a password form.">
List of credentials to be filled on touch. List of credentials to be filled on touch.
...@@ -125,9 +125,6 @@ ...@@ -125,9 +125,6 @@
<message name="IDS_TOUCH_TO_FILL_SHEET_CLOSED" desc="Accessibility string read when the Touch To Fill bottom sheet showing a list of the user's credentials is closed."> <message name="IDS_TOUCH_TO_FILL_SHEET_CLOSED" desc="Accessibility string read when the Touch To Fill bottom sheet showing a list of the user's credentials is closed.">
List of credentials to be filled on touch is closed. List of credentials to be filled on touch is closed.
</message> </message>
<message name="IDS_TOUCH_TO_FILL_USE_CREDENTIAL" desc="Text that is shown on every credential entry in Touch To Fill bottom sheet. Tapping on the credential entry will use that credential entry to sign into the currently opened website.">
Use
</message>
</messages> </messages>
</release> </release>
</grit> </grit>
246ec121718cc9220b1ed5ebb804b689c51ede80 5c2d04c928c95b168528a69cc3f53e433c66eb7d
\ No newline at end of file \ No newline at end of file
246ec121718cc9220b1ed5ebb804b689c51ede80 5c2d04c928c95b168528a69cc3f53e433c66eb7d
\ No newline at end of file \ No newline at end of file
246ec121718cc9220b1ed5ebb804b689c51ede80 5c2d04c928c95b168528a69cc3f53e433c66eb7d
\ No newline at end of file \ No newline at end of file
246ec121718cc9220b1ed5ebb804b689c51ede80 5c2d04c928c95b168528a69cc3f53e433c66eb7d
\ No newline at end of file \ No newline at end of file
246ec121718cc9220b1ed5ebb804b689c51ede80 5c2d04c928c95b168528a69cc3f53e433c66eb7d
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment