| OLD | NEW |
|---|
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. | 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. |
| 3 | 3 |
| 4 Use of this source code is governed by a BSD-style license that can be | 4 Use of this source code is governed by a BSD-style license that can be |
| 5 found in the LICENSE file. | 5 found in the LICENSE file. |
| 6 --> | 6 --> |
| 7 <org.chromium.chrome.browser.signin.AccountSigninView | 7 <org.chromium.chrome.browser.signin.AccountSigninView |
| 8 xmlns:android="http://schemas.android.com/apk/res/android" | 8 xmlns:android="http://schemas.android.com/apk/res/android" |
| 9 xmlns:chrome="http://schemas.android.com/apk/res-auto" | 9 xmlns:chrome="http://schemas.android.com/apk/res-auto" |
| 10 android:layout_width="match_parent" | 10 android:layout_width="match_parent" |
| 11 android:layout_height="match_parent"> | 11 android:layout_height="match_parent" |
| 12 | 12 android:background="@color/signin_body_background"> |
| 13 <ScrollView | 13 |
| 14 <FrameLayout |
| 14 android:layout_width="match_parent" | 15 android:layout_width="match_parent" |
| 15 android:layout_height="match_parent" | 16 android:layout_height="match_parent" |
| 16 android:layout_marginBottom="72dp" | 17 android:layout_marginBottom="52dp"> |
| 17 android:fillViewport="true"> | 18 |
| 18 | 19 <!-- The view that allows the user to choose the sign in account --> |
| 19 <LinearLayout | 20 <LinearLayout |
| 20 android:id="@+id/fre_main_layout" | 21 android:id="@+id/signin_choose_account_view" |
| 21 android:layout_width="match_parent" | 22 android:layout_width="match_parent" |
| 22 android:layout_height="wrap_content" | 23 android:layout_height="match_parent" |
| 23 android:orientation="vertical" | 24 android:orientation="vertical"> |
| 24 android:gravity="center_horizontal"> | 25 |
| 25 | 26 <!-- The layout_width/layout_height is set to 16/9 dynamically in Ja
va --> |
| 26 <TextView | 27 <TextView |
| 27 android:id="@+id/title" | 28 android:id="@+id/signin_title" |
| 28 android:text="@string/signin_set_up_chrome" | |
| 29 style="@style/FreTitle"/> | |
| 30 | |
| 31 <!-- The orientation of this view is changed dynamically to give a n
icer layout when in | |
| 32 landscape mode on devices with small screens. --> | |
| 33 <LinearLayout | |
| 34 android:id="@+id/fre_image_and_content" | |
| 35 android:layout_width="match_parent" | 29 android:layout_width="match_parent" |
| 36 android:layout_height="wrap_content" | 30 android:layout_height="wrap_content" |
| 37 android:orientation="vertical" | 31 android:gravity="bottom" |
| 38 android:gravity="center_horizontal" | 32 android:paddingStart="16dp" |
| 39 android:layout_marginTop="@dimen/fre_vertical_spacing"> | 33 android:paddingEnd="16dp" |
| 40 | 34 android:paddingBottom="16dp" |
| 41 <org.chromium.chrome.browser.firstrun.ImageCarousel | 35 android:background="@color/signin_head_background" |
| 42 android:id="@+id/image" | 36 android:textColor="@color/default_text_color" |
| 43 android:layout_width="@dimen/signin_image_carousel_width" | 37 android:textSize="@dimen/fre_title_text_size" |
| 44 android:layout_height="@dimen/fre_image_height" /> | 38 android:text="@string/sign_in_to_chrome"/> |
| 45 | 39 |
| 40 <View |
| 41 android:layout_width="match_parent" |
| 42 android:layout_height="1dp" |
| 43 android:background="@color/signin_border_line_color" |
| 44 android:alpha="0.08"/> |
| 45 |
| 46 <org.chromium.chrome.browser.signin.AccountListView |
| 47 android:id="@+id/signin_account_list" |
| 48 android:layout_width="match_parent" |
| 49 android:layout_height="wrap_content" |
| 50 android:divider="@null" |
| 51 android:dividerHeight="0dp" |
| 52 android:scrollbars="none" |
| 53 android:requiresFadingEdge="vertical" |
| 54 android:fadingEdgeLength="48dp"/> |
| 55 </LinearLayout> |
| 56 |
| 57 <!-- The view that allows the user to confirm signed in account, sync an
d service personalization --> |
| 58 <org.chromium.chrome.browser.signin.AccountSigninConfirmationView |
| 59 android:id="@+id/signin_confirmation_view" |
| 60 android:layout_width="match_parent" |
| 61 android:layout_height="match_parent" |
| 62 android:scrollbars="none" |
| 63 android:requiresFadingEdge="vertical" |
| 64 android:fadingEdgeLength="48dp" |
| 65 android:visibility="gone"> |
| 66 |
| 67 <RelativeLayout |
| 68 android:layout_width="match_parent" |
| 69 android:layout_height="wrap_content" |
| 70 android:orientation="vertical"> |
| 71 |
| 72 <!-- The layout_width/layout_height is set to 16/9 dynamically i
n Java --> |
| 46 <LinearLayout | 73 <LinearLayout |
| 47 android:id="@+id/fre_content_wrapper" | 74 android:id="@+id/signin_confirmation_head" |
| 48 android:layout_width="0dp" | 75 android:layout_width="match_parent" |
| 49 android:layout_height="0dp" | 76 android:layout_height="wrap_content" |
| 50 android:layout_weight="1" | 77 android:gravity="bottom" |
| 51 android:layout_marginTop="@dimen/fre_vertical_spacing" | 78 android:paddingStart="16dp" |
| 52 android:layout_marginEnd="@dimen/fre_content_margin" | 79 android:paddingEnd="16dp" |
| 53 android:layout_marginStart="@dimen/fre_content_margin" | 80 android:background="@color/signin_head_background" |
| 54 android:orientation="vertical" > | 81 android:orientation="vertical"> |
| 55 | 82 |
| 56 <Spinner | 83 <ImageView |
| 57 style="@style/Widget.AppCompat.Spinner.Underlined" | 84 android:id="@+id/signin_account_image" |
| 58 android:id="@+id/google_accounts_spinner" | 85 android:layout_width="64dp" |
| 59 android:layout_width="wrap_content" | 86 android:layout_height="64dp" |
| 87 android:layout_marginBottom="24dp" |
| 88 android:scaleType="fitCenter" |
| 89 android:contentDescription="@null"/> |
| 90 |
| 91 <TextView |
| 92 android:id="@+id/signin_account_name" |
| 93 android:layout_width="match_parent" |
| 60 android:layout_height="wrap_content" | 94 android:layout_height="wrap_content" |
| 61 android:layout_marginBottom="@dimen/fre_vertical_spacing
" | 95 android:layout_marginBottom="8dp" |
| 62 android:layout_gravity="center_horizontal" | 96 android:textColor="@color/default_text_color" |
| 63 android:popupBackground="#ffffff" | 97 android:textSize="@dimen/fre_title_text_size" |
| 64 android:paddingStart="0dp" | 98 android:ellipsize="end" |
| 65 android:paddingEnd="0dp" | 99 android:maxLines="1"/> |
| 66 android:textColor="@color/fre_text_color" /> | |
| 67 | 100 |
| 68 <TextView | 101 <TextView |
| 69 android:id="@+id/confirm_account_email" | 102 android:id="@+id/signin_account_email" |
| 70 android:layout_width="wrap_content" | 103 android:layout_width="match_parent" |
| 71 android:layout_height="wrap_content" | 104 android:layout_height="wrap_content" |
| 72 android:layout_gravity="center" | |
| 73 android:layout_marginBottom="16dp" | 105 android:layout_marginBottom="16dp" |
| 74 android:paddingTop="12dp" | 106 android:textColor="@color/descriptive_text_color" |
| 75 android:paddingBottom="8dp" | 107 android:textSize="@dimen/fre_normal_text_size" |
| 76 android:textColor="@color/fre_text_color" | 108 android:ellipsize="end" |
| 77 android:visibility="gone" /> | 109 android:maxLines="1"/> |
| 78 | 110 </LinearLayout> |
| 79 <org.chromium.ui.widget.TextViewWithClickableSpans | 111 |
| 80 android:id="@+id/description" | 112 <View |
| 81 android:layout_width="wrap_content" | 113 android:id="@+id/signin_confirmation_head_body_border" |
| 82 android:layout_height="wrap_content" | 114 android:layout_width="match_parent" |
| 83 android:gravity="center" | 115 android:layout_height="1dp" |
| 84 android:lineSpacingMultiplier="1.4" | 116 android:layout_below="@id/signin_confirmation_head" |
| 85 android:text="@string/signin_account_choice_description" | 117 android:background="@color/signin_border_line_color" |
| 86 android:textColor="@color/signin_light_text_color" | 118 android:alpha="0.08"/> |
| 87 android:textSize="@dimen/fre_normal_text_size" /> | 119 |
| 88 </LinearLayout> | 120 <TextView |
| 89 | 121 android:id="@+id/signin_chrome_sync_title" |
| 90 </LinearLayout> | 122 android:layout_width="match_parent" |
| 91 </LinearLayout> | 123 android:layout_height="wrap_content" |
| 92 </ScrollView> | 124 android:layout_marginTop="16dp" |
| 93 | 125 android:layout_marginBottom="8dp" |
| 94 <!-- layout_height = 72dp = fre_button_bar_height + paddingTop --> | 126 android:layout_below="@id/signin_confirmation_head_body_bord
er" |
| 127 android:paddingStart="16dp" |
| 128 android:paddingEnd="16dp" |
| 129 android:text="@string/sync_confirmation_chrome_sync_title" |
| 130 android:textColor="@color/default_text_color" |
| 131 android:textSize="@dimen/fre_normal_text_size" |
| 132 android:fontFamily="sans-serif-medium" |
| 133 android:drawableStart="@drawable/chrome_sync_logo" |
| 134 android:drawablePadding="16dp"/> |
| 135 |
| 136 <TextView |
| 137 android:id="@+id/signin_chrome_sync_description" |
| 138 android:layout_width="match_parent" |
| 139 android:layout_height="wrap_content" |
| 140 android:layout_marginBottom="16dp" |
| 141 android:layout_below="@id/signin_chrome_sync_title" |
| 142 android:paddingStart="56dp" |
| 143 android:paddingEnd="16dp" |
| 144 android:lineSpacingMultiplier="1.4" |
| 145 android:text="@string/sync_confirmation_chrome_sync_message" |
| 146 android:textColor="@color/descriptive_text_color" |
| 147 android:textSize="@dimen/fre_normal_text_size" /> |
| 148 |
| 149 <View |
| 150 android:id="@+id/signin_confirmation_body_rule_line" |
| 151 android:layout_width="match_parent" |
| 152 android:layout_height="1dp" |
| 153 android:layout_marginStart="56dp" |
| 154 android:layout_marginEnd="16dp" |
| 155 android:layout_below="@id/signin_chrome_sync_description" |
| 156 android:background="@color/signin_border_line_color" |
| 157 android:alpha="0.08"/> |
| 158 |
| 159 <TextView |
| 160 android:id="@+id/signin_personalize_service_title" |
| 161 android:layout_width="match_parent" |
| 162 android:layout_height="wrap_content" |
| 163 android:layout_marginTop="16dp" |
| 164 android:layout_marginBottom="8dp" |
| 165 android:layout_below="@id/signin_confirmation_body_rule_line
" |
| 166 android:paddingStart="16dp" |
| 167 android:paddingEnd="16dp" |
| 168 android:text="@string/sync_confirmation_personalize_services
_title" |
| 169 android:textColor="@color/default_text_color" |
| 170 android:textSize="@dimen/fre_normal_text_size" |
| 171 android:fontFamily="sans-serif-medium" |
| 172 android:drawableStart="@drawable/googleg" |
| 173 android:drawablePadding="16dp"/> |
| 174 |
| 175 <TextView |
| 176 android:id="@+id/signin_personalize_service_description" |
| 177 android:layout_width="match_parent" |
| 178 android:layout_height="wrap_content" |
| 179 android:layout_marginBottom="32dp" |
| 180 android:layout_below="@id/signin_personalize_service_title" |
| 181 android:paddingStart="56dp" |
| 182 android:paddingEnd="16dp" |
| 183 android:lineSpacingMultiplier="1.4" |
| 184 android:text="@string/sync_confirmation_personalize_services
_body" |
| 185 android:textColor="@color/descriptive_text_color" |
| 186 android:textSize="@dimen/fre_normal_text_size"/> |
| 187 |
| 188 <org.chromium.ui.widget.TextViewWithClickableSpans |
| 189 android:id="@+id/signin_settings_control" |
| 190 android:layout_width="match_parent" |
| 191 android:layout_height="wrap_content" |
| 192 android:layout_below="@id/signin_personalize_service_descrip
tion" |
| 193 android:paddingStart="16dp" |
| 194 android:paddingEnd="16dp" |
| 195 android:paddingBottom="36dp" |
| 196 android:lineSpacingMultiplier="1.4" |
| 197 android:text="@string/signin_signed_in_settings_description" |
| 198 android:textColor="@color/descriptive_text_color" |
| 199 android:textSize="@dimen/fre_normal_text_size" /> |
| 200 </RelativeLayout> |
| 201 </org.chromium.chrome.browser.signin.AccountSigninConfirmationView> |
| 202 </FrameLayout> |
| 203 |
| 95 <LinearLayout | 204 <LinearLayout |
| 96 android:id="@+id/button_bar" | 205 android:id="@+id/button_bar" |
| 97 android:layout_width="match_parent" | 206 android:layout_width="match_parent" |
| 98 android:layout_height="72dp" | 207 android:layout_height="52dp" |
| 99 android:layout_gravity="bottom" | 208 android:layout_gravity="bottom" |
| 100 android:orientation="horizontal" | |
| 101 android:paddingTop="16dp" | |
| 102 android:paddingStart="16dp" | 209 android:paddingStart="16dp" |
| 103 android:paddingEnd="16dp" > | 210 android:paddingEnd="16dp" |
| 211 android:orientation="horizontal" > |
| 104 | 212 |
| 105 <!--suppress ButtonStyle --> | 213 <!--suppress ButtonStyle --> |
| 106 <Button | 214 <Button |
| 107 android:id="@+id/negative_button" | 215 android:id="@+id/negative_button" |
| 108 style="@style/ButtonCompatBorderless" | 216 style="@style/ButtonCompatBorderless" |
| 109 android:layout_width="wrap_content" | 217 android:layout_width="wrap_content" |
| 110 android:layout_height="36dp" | 218 android:layout_height="36dp" |
| 111 android:text="@string/fre_skip_text" | 219 android:text="@string/fre_skip_text" |
| 112 android:textAllCaps="true" | 220 android:textAllCaps="true" |
| 113 android:textColor="@color/light_active_color" | 221 android:textColor="@color/light_active_color" |
| 114 android:textSize="14sp" | 222 android:textSize="14sp"/> |
| 115 android:layout_marginBottom="24dp" /> | |
| 116 | 223 |
| 117 <View | 224 <View |
| 118 android:layout_width="0dp" | 225 android:layout_width="0dp" |
| 119 android:layout_height="0dp" | 226 android:layout_height="0dp" |
| 120 android:layout_weight="1" | 227 android:layout_weight="1" |
| 121 android:visibility="invisible"/> | 228 android:visibility="invisible"/> |
| 122 | 229 |
| 123 <!--suppress ButtonStyle --> | 230 <!--suppress ButtonStyle --> |
| 124 <org.chromium.ui.widget.ButtonCompat | 231 <org.chromium.ui.widget.ButtonCompat |
| 125 android:id="@+id/positive_button" | 232 android:id="@+id/positive_button" |
| 126 android:layout_width="wrap_content" | 233 android:layout_width="wrap_content" |
| 127 android:layout_height="36dp" | 234 android:layout_height="36dp" |
| 128 android:text="@string/choose_account_sign_in" | 235 android:text="@string/choose_account_sign_in" |
| 129 android:textAllCaps="true" | 236 android:textAllCaps="true" |
| 130 android:textColor="@android:color/white" | 237 android:textColor="@android:color/white" |
| 131 android:textSize="14sp" | 238 android:textSize="14sp" |
| 132 chrome:buttonColor="@color/light_active_color" | 239 chrome:buttonColor="@color/light_active_color"/> |
| 133 android:layout_marginBottom="24dp" /> | |
| 134 | 240 |
| 135 <View | 241 <View |
| 136 android:id="@+id/positive_button_end_padding" | 242 android:id="@+id/positive_button_end_padding" |
| 137 android:layout_width="0dp" | 243 android:layout_width="0dp" |
| 138 android:layout_height="0dp" | 244 android:layout_height="0dp" |
| 139 android:layout_weight="1" | 245 android:layout_weight="1" |
| 140 android:visibility="gone"/> | 246 android:visibility="gone"/> |
| 141 </LinearLayout> | 247 </LinearLayout> |
| 142 | 248 |
| 143 </org.chromium.chrome.browser.signin.AccountSigninView> | 249 </org.chromium.chrome.browser.signin.AccountSigninView> |
| OLD | NEW |
|---|
Chromium Code Reviews
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