Skip to content

GitLab

T
tangled
Commit 9db7b347 authored by Boris Sazonov's avatar Boris Sazonov Committed by Commit Bot
Browse files
Options

[TouchToFill][Android] Update bottom sheet layout 

Changes layout to match mocks. Screenshot: https://crbug.com/1009331#c6.

Bug: 957532, 1009331
Change-Id: If35ec176ca278c6c4c0aeb83f281202fe76b8b79
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1841337
Auto-Submit: Boris Sazonov <bsazonov@chromium.org>
Reviewed-by: default avatarFriedrich [CET] <fhorschig@chromium.org>
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#703265}
parent dd675c86
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 12 deletions
chrome/browser/touch_to_fill/android/internal/BUILD.gn
View file @ 9db7b347
...@@ -32,6 +32,7 @@ android_library("java") { ...@@ -32,6 +32,7 @@ android_library("java") {
android_resources("java_resources") { android_resources("java_resources") {
deps = [ deps = [
":java_strings_grd", ":java_strings_grd",
"//third_party/android_deps:android_support_v7_appcompat_java",
"//ui/android:ui_java_resources", "//ui/android:ui_java_resources",
] ]
resource_dirs = [ "java/res" ] resource_dirs = [ "java/res" ]
......
chrome/browser/touch_to_fill/android/internal/java/res/drawable/touch_to_fill_credential_background.xml 0 → 100644
View file @ 9db7b347
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright 2019 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke android:width="1dp" android:color="@color/hairline_stroke_color"/>
<corners android:radius="8dp"/>
</shape>
chrome/browser/touch_to_fill/android/internal/java/res/layout/touch_to_fill_credential_item.xml
View file @ 9db7b347
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
android:minHeight="70dp" android:minHeight="70dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="10dp" android:background="@drawable/touch_to_fill_credential_background">
android:paddingEnd="10dp">
<ImageView <ImageView
android:id="@+id/favicon" android:id="@+id/favicon"
android:layout_width="20dp" android:layout_width="20dp"
...@@ -41,4 +41,11 @@ ...@@ -41,4 +41,11 @@
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/TextAppearance.BlackBody" /> android:textAppearance="@style/TextAppearance.BlackBody" />
</LinearLayout> </LinearLayout>
</LinearLayout> <TextView
\ No newline at end of file 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>
chrome/browser/touch_to_fill/android/internal/java/res/layout/touch_to_fill_sheet.xml
View file @ 9db7b347
...@@ -5,17 +5,29 @@ ...@@ -5,17 +5,29 @@
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_width="match_parent" android:layout_width="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:background="@color/default_bg_color_elev_3"> android:paddingStart="16dp"
android:paddingEnd="16dp">
<ImageView
android:id="@+id/drag_handlebar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:importantForAccessibility="no"
app:srcCompat="@drawable/drag_handlebar" />
<org.chromium.ui.widget.TextViewWithLeading <org.chromium.ui.widget.TextViewWithLeading
android:layout_marginTop="50dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAlignment="center" android:textAlignment="center"
android:text="@string/touch_to_fill_sheet_title" android:text="@string/touch_to_fill_sheet_title"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.BlackHeadline" /> android:textAppearance="@style/TextAppearance.BlackHeadline" />
<org.chromium.ui.widget.TextViewWithLeading <org.chromium.ui.widget.TextViewWithLeading
...@@ -30,5 +42,8 @@ ...@@ -30,5 +42,8 @@
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="0dp" /> android:dividerHeight="6dp"
android:paddingTop="16dp"
android:paddingBottom="16dp"
tools:listitem="@layout/touch_to_fill_credential_item"/>
</LinearLayout> </LinearLayout>
chrome/browser/touch_to_fill/android/internal/java/strings/android_touch_to_fill_strings.grd
View file @ 9db7b347
...@@ -107,11 +107,11 @@ ...@@ -107,11 +107,11 @@
<release allow_pseudo="false" seq="1"> <release allow_pseudo="false" seq="1">
<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.">
Choose an account Pick your 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 into <ph name="SITE_NAME">%1$s<ex>airbnb.com</ex></ph> with Chrome Sign in to <ph name="SITE_NAME">%1$s<ex>airbnb.com</ex></ph> using Chrome
</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.
...@@ -122,9 +122,12 @@ ...@@ -122,9 +122,12 @@
<message name="IDS_TOUCH_TO_FILL_SHEET_FULL_HEIGHT" desc="Accessibility string read when the Touch To Fill bottom sheet showing a list of the user's credentials is opened at full height. The sheet will occupy the entire screen."> <message name="IDS_TOUCH_TO_FILL_SHEET_FULL_HEIGHT" desc="Accessibility string read when the Touch To Fill bottom sheet showing a list of the user's credentials is opened at full height. The sheet will occupy the entire screen.">
List of credentials to be filled on touch opened at full height. List of credentials to be filled on touch opened at full height.
</message> </message>
<message name="IDS_TOUCH_TO_FILL_SHEET_CLOSED" desc="Accessibility string read when the Toch 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>
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