| 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" |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 android:layout_height="wrap_content" | 38 android:layout_height="wrap_content" |
| 39 android:gravity="bottom" | 39 android:gravity="bottom" |
| 40 android:paddingStart="@dimen/signin_chooser_padding" | 40 android:paddingStart="@dimen/signin_chooser_padding" |
| 41 android:paddingEnd="@dimen/signin_chooser_padding" | 41 android:paddingEnd="@dimen/signin_chooser_padding" |
| 42 android:paddingBottom="@dimen/signin_chooser_padding" | 42 android:paddingBottom="@dimen/signin_chooser_padding" |
| 43 android:background="@color/signin_head_background" | 43 android:background="@color/signin_head_background" |
| 44 android:textColor="@color/default_text_color" | 44 android:textColor="@color/default_text_color" |
| 45 android:textSize="@dimen/fre_title_text_size" | 45 android:textSize="@dimen/fre_title_text_size" |
| 46 android:text="@string/sign_in_to_chrome"/> | 46 android:text="@string/sign_in_to_chrome"/> |
| 47 | 47 |
| 48 <View | 48 <View style="@style/Divider"/> |
| 49 android:layout_width="match_parent" | |
| 50 android:layout_height="1dp" | |
| 51 android:background="@color/signin_border_line_color" | |
| 52 android:alpha="0.08"/> | |
| 53 | 49 |
| 54 <TextView | 50 <TextView |
| 55 android:id="@+id/signin_choice_description" | 51 android:id="@+id/signin_choice_description" |
| 56 android:layout_width="wrap_content" | 52 android:layout_width="wrap_content" |
| 57 android:layout_height="wrap_content" | 53 android:layout_height="wrap_content" |
| 58 android:padding="@dimen/signin_chooser_padding" | 54 android:padding="@dimen/signin_chooser_padding" |
| 59 android:lineSpacingMultiplier="1.4" | 55 android:lineSpacingMultiplier="1.4" |
| 60 android:text="@string/signin_account_choice_description" | 56 android:text="@string/signin_account_choice_description" |
| 61 android:textColor="@color/default_text_color" | 57 android:textColor="@color/default_text_color" |
| 62 android:textSize="@dimen/fre_normal_text_size"/> | 58 android:textSize="@dimen/fre_normal_text_size"/> |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 113 android:layout_height="wrap_content" | 109 android:layout_height="wrap_content" |
| 114 android:layout_marginBottom="16dp" | 110 android:layout_marginBottom="16dp" |
| 115 android:textColor="@color/descriptive_text_color" | 111 android:textColor="@color/descriptive_text_color" |
| 116 android:textSize="@dimen/fre_normal_text_size" | 112 android:textSize="@dimen/fre_normal_text_size" |
| 117 android:ellipsize="end" | 113 android:ellipsize="end" |
| 118 android:maxLines="1"/> | 114 android:maxLines="1"/> |
| 119 </LinearLayout> | 115 </LinearLayout> |
| 120 | 116 |
| 121 <View | 117 <View |
| 122 android:id="@+id/signin_confirmation_head_body_border" | 118 android:id="@+id/signin_confirmation_head_body_border" |
| 123 android:layout_width="match_parent" | 119 style="@style/Divider" |
| 124 android:layout_height="1dp" | 120 android:layout_below="@id/signin_confirmation_head"/> |
| 125 android:layout_below="@id/signin_confirmation_head" | |
| 126 android:background="@color/signin_border_line_color" | |
| 127 android:alpha="0.08"/> | |
| 128 | 121 |
| 129 <TextView | 122 <TextView |
| 130 android:id="@+id/signin_chrome_sync_title" | 123 android:id="@+id/signin_chrome_sync_title" |
| 131 android:layout_width="match_parent" | 124 android:layout_width="match_parent" |
| 132 android:layout_height="wrap_content" | 125 android:layout_height="wrap_content" |
| 133 android:layout_marginTop="16dp" | 126 android:layout_marginTop="16dp" |
| 134 android:layout_marginBottom="8dp" | 127 android:layout_marginBottom="8dp" |
| 135 android:layout_below="@id/signin_confirmation_head_body_bord
er" | 128 android:layout_below="@id/signin_confirmation_head_body_bord
er" |
| 136 android:paddingStart="16dp" | 129 android:paddingStart="16dp" |
| 137 android:paddingEnd="16dp" | 130 android:paddingEnd="16dp" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 150 android:layout_below="@id/signin_chrome_sync_title" | 143 android:layout_below="@id/signin_chrome_sync_title" |
| 151 android:paddingStart="56dp" | 144 android:paddingStart="56dp" |
| 152 android:paddingEnd="16dp" | 145 android:paddingEnd="16dp" |
| 153 android:lineSpacingMultiplier="1.4" | 146 android:lineSpacingMultiplier="1.4" |
| 154 android:text="@string/sync_confirmation_chrome_sync_message" | 147 android:text="@string/sync_confirmation_chrome_sync_message" |
| 155 android:textColor="@color/descriptive_text_color" | 148 android:textColor="@color/descriptive_text_color" |
| 156 android:textSize="@dimen/fre_normal_text_size" /> | 149 android:textSize="@dimen/fre_normal_text_size" /> |
| 157 | 150 |
| 158 <View | 151 <View |
| 159 android:id="@+id/signin_confirmation_body_rule_line" | 152 android:id="@+id/signin_confirmation_body_rule_line" |
| 160 android:layout_width="match_parent" | 153 style="@style/Divider" |
| 161 android:layout_height="1dp" | |
| 162 android:layout_marginStart="56dp" | 154 android:layout_marginStart="56dp" |
| 163 android:layout_marginEnd="16dp" | 155 android:layout_marginEnd="16dp" |
| 164 android:layout_below="@id/signin_chrome_sync_description" | 156 android:layout_below="@id/signin_chrome_sync_description"/> |
| 165 android:background="@color/signin_border_line_color" | |
| 166 android:alpha="0.08"/> | |
| 167 | 157 |
| 168 <TextView | 158 <TextView |
| 169 android:id="@+id/signin_personalize_service_title" | 159 android:id="@+id/signin_personalize_service_title" |
| 170 android:layout_width="match_parent" | 160 android:layout_width="match_parent" |
| 171 android:layout_height="wrap_content" | 161 android:layout_height="wrap_content" |
| 172 android:layout_marginTop="16dp" | 162 android:layout_marginTop="16dp" |
| 173 android:layout_marginBottom="8dp" | 163 android:layout_marginBottom="8dp" |
| 174 android:layout_below="@id/signin_confirmation_body_rule_line
" | 164 android:layout_below="@id/signin_confirmation_body_rule_line
" |
| 175 android:paddingStart="16dp" | 165 android:paddingStart="16dp" |
| 176 android:paddingEnd="16dp" | 166 android:paddingEnd="16dp" |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 273 | 263 |
| 274 <View | 264 <View |
| 275 android:id="@+id/positive_button_end_padding" | 265 android:id="@+id/positive_button_end_padding" |
| 276 android:layout_width="0dp" | 266 android:layout_width="0dp" |
| 277 android:layout_height="0dp" | 267 android:layout_height="0dp" |
| 278 android:layout_weight="1" | 268 android:layout_weight="1" |
| 279 android:visibility="gone"/> | 269 android:visibility="gone"/> |
| 280 </LinearLayout> | 270 </LinearLayout> |
| 281 | 271 |
| 282 </org.chromium.chrome.browser.signin.AccountSigninView> | 272 </org.chromium.chrome.browser.signin.AccountSigninView> |
| OLD | NEW |