Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(628)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/android/java/res/layout/account_signin_view.xml

Issue 1840513002: Redesign sign in and sign in confirmation screens for Narnia 2.0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/java/res/layout/account_signin_choice_description_view.xml ('k') | chrome/android/java/res/layout/fre_spinner_dropdown.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/res/layout/account_signin_view.xml
diff --git a/chrome/android/java/res/layout/account_signin_view.xml b/chrome/android/java/res/layout/account_signin_view.xml
index 5e31977e44233fef05908c971957df09e8fcd3d3..b1467f73c7bb4d7a6355b83784b4adccf229ee41 100644
--- a/chrome/android/java/res/layout/account_signin_view.xml
+++ b/chrome/android/java/res/layout/account_signin_view.xml
@@ -8,99 +8,207 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:chrome="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="match_parent"
+ android:background="@color/signin_body_background">
- <ScrollView
+ <FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginBottom="72dp"
- android:fillViewport="true">
+ android:layout_marginBottom="52dp">
+ <!-- The view that allows the user to choose the sign in account -->
<LinearLayout
- android:id="@+id/fre_main_layout"
+ android:id="@+id/signin_choose_account_view"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:gravity="center_horizontal">
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+ <!-- The layout_width/layout_height is set to 16/9 dynamically in Java -->
<TextView
- android:id="@+id/title"
- android:text="@string/signin_set_up_chrome"
- style="@style/FreTitle"/>
-
- <!-- The orientation of this view is changed dynamically to give a nicer layout when in
- landscape mode on devices with small screens. -->
- <LinearLayout
- android:id="@+id/fre_image_and_content"
+ android:id="@+id/signin_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:gravity="center_horizontal"
- android:layout_marginTop="@dimen/fre_vertical_spacing">
+ android:gravity="bottom"
+ android:paddingStart="16dp"
+ android:paddingEnd="16dp"
+ android:paddingBottom="16dp"
+ android:background="@color/signin_head_background"
+ android:textColor="@color/default_text_color"
+ android:textSize="@dimen/fre_title_text_size"
+ android:text="@string/sign_in_to_chrome"/>
- <org.chromium.chrome.browser.firstrun.ImageCarousel
- android:id="@+id/image"
- android:layout_width="@dimen/signin_image_carousel_width"
- android:layout_height="@dimen/fre_image_height" />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="@color/signin_border_line_color"
+ android:alpha="0.08"/>
+
+ <org.chromium.chrome.browser.signin.AccountListView
+ android:id="@+id/signin_account_list"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:divider="@null"
+ android:dividerHeight="0dp"
+ android:scrollbars="none"
+ android:requiresFadingEdge="vertical"
+ android:fadingEdgeLength="48dp"/>
+ </LinearLayout>
+
+ <!-- The view that allows the user to confirm signed in account, sync and service personalization -->
+ <org.chromium.chrome.browser.signin.AccountSigninConfirmationView
+ android:id="@+id/signin_confirmation_view"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:scrollbars="none"
+ android:requiresFadingEdge="vertical"
+ android:fadingEdgeLength="48dp"
+ android:visibility="gone">
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+ <!-- The layout_width/layout_height is set to 16/9 dynamically in Java -->
<LinearLayout
- android:id="@+id/fre_content_wrapper"
- android:layout_width="0dp"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:layout_marginTop="@dimen/fre_vertical_spacing"
- android:layout_marginEnd="@dimen/fre_content_margin"
- android:layout_marginStart="@dimen/fre_content_margin"
- android:orientation="vertical" >
-
- <Spinner
- style="@style/Widget.AppCompat.Spinner.Underlined"
- android:id="@+id/google_accounts_spinner"
- android:layout_width="wrap_content"
+ android:id="@+id/signin_confirmation_head"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="bottom"
+ android:paddingStart="16dp"
+ android:paddingEnd="16dp"
+ android:background="@color/signin_head_background"
+ android:orientation="vertical">
+
+ <ImageView
+ android:id="@+id/signin_account_image"
+ android:layout_width="64dp"
+ android:layout_height="64dp"
+ android:layout_marginBottom="24dp"
+ android:scaleType="fitCenter"
+ android:contentDescription="@null"/>
+
+ <TextView
+ android:id="@+id/signin_account_name"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/fre_vertical_spacing"
- android:layout_gravity="center_horizontal"
- android:popupBackground="#ffffff"
- android:paddingStart="0dp"
- android:paddingEnd="0dp"
- android:textColor="@color/fre_text_color" />
+ android:layout_marginBottom="8dp"
+ android:textColor="@color/default_text_color"
+ android:textSize="@dimen/fre_title_text_size"
+ android:ellipsize="end"
+ android:maxLines="1"/>
<TextView
- android:id="@+id/confirm_account_email"
- android:layout_width="wrap_content"
+ android:id="@+id/signin_account_email"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_gravity="center"
android:layout_marginBottom="16dp"
- android:paddingTop="12dp"
- android:paddingBottom="8dp"
- android:textColor="@color/fre_text_color"
- android:visibility="gone" />
-
- <org.chromium.ui.widget.TextViewWithClickableSpans
- android:id="@+id/description"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:lineSpacingMultiplier="1.4"
- android:text="@string/signin_account_choice_description"
- android:textColor="@color/signin_light_text_color"
- android:textSize="@dimen/fre_normal_text_size" />
- </LinearLayout>
-
- </LinearLayout>
- </LinearLayout>
- </ScrollView>
+ android:textColor="@color/descriptive_text_color"
+ android:textSize="@dimen/fre_normal_text_size"
+ android:ellipsize="end"
+ android:maxLines="1"/>
+ </LinearLayout>
+
+ <View
+ android:id="@+id/signin_confirmation_head_body_border"
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_below="@id/signin_confirmation_head"
+ android:background="@color/signin_border_line_color"
+ android:alpha="0.08"/>
+
+ <TextView
+ android:id="@+id/signin_chrome_sync_title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="16dp"
+ android:layout_marginBottom="8dp"
+ android:layout_below="@id/signin_confirmation_head_body_border"
+ android:paddingStart="16dp"
+ android:paddingEnd="16dp"
+ android:text="@string/sync_confirmation_chrome_sync_title"
+ android:textColor="@color/default_text_color"
+ android:textSize="@dimen/fre_normal_text_size"
+ android:fontFamily="sans-serif-medium"
+ android:drawableStart="@drawable/chrome_sync_logo"
+ android:drawablePadding="16dp"/>
+
+ <TextView
+ android:id="@+id/signin_chrome_sync_description"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="16dp"
+ android:layout_below="@id/signin_chrome_sync_title"
+ android:paddingStart="56dp"
+ android:paddingEnd="16dp"
+ android:lineSpacingMultiplier="1.4"
+ android:text="@string/sync_confirmation_chrome_sync_message"
+ android:textColor="@color/descriptive_text_color"
+ android:textSize="@dimen/fre_normal_text_size" />
+
+ <View
+ android:id="@+id/signin_confirmation_body_rule_line"
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:layout_marginStart="56dp"
+ android:layout_marginEnd="16dp"
+ android:layout_below="@id/signin_chrome_sync_description"
+ android:background="@color/signin_border_line_color"
+ android:alpha="0.08"/>
+
+ <TextView
+ android:id="@+id/signin_personalize_service_title"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="16dp"
+ android:layout_marginBottom="8dp"
+ android:layout_below="@id/signin_confirmation_body_rule_line"
+ android:paddingStart="16dp"
+ android:paddingEnd="16dp"
+ android:text="@string/sync_confirmation_personalize_services_title"
+ android:textColor="@color/default_text_color"
+ android:textSize="@dimen/fre_normal_text_size"
+ android:fontFamily="sans-serif-medium"
+ android:drawableStart="@drawable/googleg"
+ android:drawablePadding="16dp"/>
+
+ <TextView
+ android:id="@+id/signin_personalize_service_description"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="32dp"
+ android:layout_below="@id/signin_personalize_service_title"
+ android:paddingStart="56dp"
+ android:paddingEnd="16dp"
+ android:lineSpacingMultiplier="1.4"
+ android:text="@string/sync_confirmation_personalize_services_body"
+ android:textColor="@color/descriptive_text_color"
+ android:textSize="@dimen/fre_normal_text_size"/>
+
+ <org.chromium.ui.widget.TextViewWithClickableSpans
+ android:id="@+id/signin_settings_control"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/signin_personalize_service_description"
+ android:paddingStart="16dp"
+ android:paddingEnd="16dp"
+ android:paddingBottom="36dp"
+ android:lineSpacingMultiplier="1.4"
+ android:text="@string/signin_signed_in_settings_description"
+ android:textColor="@color/descriptive_text_color"
+ android:textSize="@dimen/fre_normal_text_size" />
+ </RelativeLayout>
+ </org.chromium.chrome.browser.signin.AccountSigninConfirmationView>
+ </FrameLayout>
- <!-- layout_height = 72dp = fre_button_bar_height + paddingTop -->
<LinearLayout
android:id="@+id/button_bar"
android:layout_width="match_parent"
- android:layout_height="72dp"
+ android:layout_height="52dp"
android:layout_gravity="bottom"
- android:orientation="horizontal"
- android:paddingTop="16dp"
android:paddingStart="16dp"
- android:paddingEnd="16dp" >
+ android:paddingEnd="16dp"
+ android:orientation="horizontal" >
<!--suppress ButtonStyle -->
<Button
@@ -111,8 +219,7 @@
android:text="@string/fre_skip_text"
android:textAllCaps="true"
android:textColor="@color/light_active_color"
- android:textSize="14sp"
- android:layout_marginBottom="24dp" />
+ android:textSize="14sp"/>
<View
android:layout_width="0dp"
@@ -129,8 +236,7 @@
android:textAllCaps="true"
android:textColor="@android:color/white"
android:textSize="14sp"
- chrome:buttonColor="@color/light_active_color"
- android:layout_marginBottom="24dp" />
+ chrome:buttonColor="@color/light_active_color"/>
<View
android:id="@+id/positive_button_end_padding"
« no previous file with comments | « chrome/android/java/res/layout/account_signin_choice_description_view.xml ('k') | chrome/android/java/res/layout/fre_spinner_dropdown.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698