| 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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 android:layout_marginBottom="16dp" | 110 android:layout_marginBottom="16dp" |
| 111 android:textColor="@color/descriptive_text_color" | 111 android:textColor="@color/descriptive_text_color" |
| 112 android:textSize="@dimen/fre_normal_text_size" | 112 android:textSize="@dimen/fre_normal_text_size" |
| 113 android:ellipsize="end" | 113 android:ellipsize="end" |
| 114 android:maxLines="1"/> | 114 android:maxLines="1"/> |
| 115 </LinearLayout> | 115 </LinearLayout> |
| 116 | 116 |
| 117 <View style="@style/Divider"/> | 117 <View style="@style/Divider"/> |
| 118 | 118 |
| 119 <TextView | 119 <TextView |
| 120 style="@style/RobotoMediumStyle" |
| 120 android:layout_width="match_parent" | 121 android:layout_width="match_parent" |
| 121 android:layout_height="wrap_content" | 122 android:layout_height="wrap_content" |
| 122 android:layout_marginTop="16dp" | 123 android:layout_marginTop="16dp" |
| 123 android:layout_marginBottom="8dp" | 124 android:layout_marginBottom="8dp" |
| 124 android:paddingStart="16dp" | 125 android:paddingStart="16dp" |
| 125 android:paddingEnd="16dp" | 126 android:paddingEnd="16dp" |
| 126 android:text="@string/sync_confirmation_chrome_sync_title" | 127 android:text="@string/sync_confirmation_chrome_sync_title" |
| 127 android:textColor="@color/default_text_color" | 128 android:textColor="@color/default_text_color" |
| 128 android:textSize="@dimen/fre_normal_text_size" | 129 android:textSize="@dimen/fre_normal_text_size" |
| 129 android:fontFamily="sans-serif-medium" | |
| 130 android:drawableStart="@drawable/chrome_sync_logo" | 130 android:drawableStart="@drawable/chrome_sync_logo" |
| 131 android:drawablePadding="16dp"/> | 131 android:drawablePadding="16dp"/> |
| 132 | 132 |
| 133 <TextView | 133 <TextView |
| 134 android:layout_width="match_parent" | 134 android:layout_width="match_parent" |
| 135 android:layout_height="wrap_content" | 135 android:layout_height="wrap_content" |
| 136 android:layout_marginBottom="16dp" | 136 android:layout_marginBottom="16dp" |
| 137 android:paddingStart="56dp" | 137 android:paddingStart="56dp" |
| 138 android:paddingEnd="16dp" | 138 android:paddingEnd="16dp" |
| 139 android:lineSpacingMultiplier="1.4" | 139 android:lineSpacingMultiplier="1.4" |
| 140 android:text="@string/sync_confirmation_chrome_sync_message" | 140 android:text="@string/sync_confirmation_chrome_sync_message" |
| 141 android:textColor="@color/descriptive_text_color" | 141 android:textColor="@color/descriptive_text_color" |
| 142 android:textSize="@dimen/fre_normal_text_size" /> | 142 android:textSize="@dimen/fre_normal_text_size" /> |
| 143 | 143 |
| 144 <View | 144 <View |
| 145 style="@style/Divider" | 145 style="@style/Divider" |
| 146 android:layout_marginStart="56dp" | 146 android:layout_marginStart="56dp" |
| 147 android:layout_marginEnd="16dp"/> | 147 android:layout_marginEnd="16dp"/> |
| 148 | 148 |
| 149 <TextView | 149 <TextView |
| 150 style="@style/RobotoMediumStyle" |
| 150 android:layout_width="match_parent" | 151 android:layout_width="match_parent" |
| 151 android:layout_height="wrap_content" | 152 android:layout_height="wrap_content" |
| 152 android:layout_marginTop="16dp" | 153 android:layout_marginTop="16dp" |
| 153 android:layout_marginBottom="8dp" | 154 android:layout_marginBottom="8dp" |
| 154 android:paddingStart="16dp" | 155 android:paddingStart="16dp" |
| 155 android:paddingEnd="16dp" | 156 android:paddingEnd="16dp" |
| 156 android:text="@string/sync_confirmation_personalize_services
_title" | 157 android:text="@string/sync_confirmation_personalize_services
_title" |
| 157 android:textColor="@color/default_text_color" | 158 android:textColor="@color/default_text_color" |
| 158 android:textSize="@dimen/fre_normal_text_size" | 159 android:textSize="@dimen/fre_normal_text_size" |
| 159 android:fontFamily="sans-serif-medium" | |
| 160 android:drawableStart="@drawable/googleg" | 160 android:drawableStart="@drawable/googleg" |
| 161 android:drawablePadding="16dp"/> | 161 android:drawablePadding="16dp"/> |
| 162 | 162 |
| 163 <TextView | 163 <TextView |
| 164 android:id="@+id/signin_personalize_service_description" | 164 android:id="@+id/signin_personalize_service_description" |
| 165 android:layout_width="match_parent" | 165 android:layout_width="match_parent" |
| 166 android:layout_height="wrap_content" | 166 android:layout_height="wrap_content" |
| 167 android:layout_marginBottom="32dp" | 167 android:layout_marginBottom="32dp" |
| 168 android:paddingStart="56dp" | 168 android:paddingStart="56dp" |
| 169 android:paddingEnd="16dp" | 169 android:paddingEnd="16dp" |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 244 | 244 |
| 245 <View | 245 <View |
| 246 android:id="@+id/positive_button_end_padding" | 246 android:id="@+id/positive_button_end_padding" |
| 247 android:layout_width="0dp" | 247 android:layout_width="0dp" |
| 248 android:layout_height="0dp" | 248 android:layout_height="0dp" |
| 249 android:layout_weight="1" | 249 android:layout_weight="1" |
| 250 android:visibility="gone"/> | 250 android:visibility="gone"/> |
| 251 </LinearLayout> | 251 </LinearLayout> |
| 252 | 252 |
| 253 </org.chromium.chrome.browser.signin.AccountSigninView> | 253 </org.chromium.chrome.browser.signin.AccountSigninView> |
| OLD | NEW |