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 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 android:paddingStart="16dp" | 218 android:paddingStart="16dp" |
219 android:paddingEnd="16dp" | 219 android:paddingEnd="16dp" |
220 android:orientation="horizontal" > | 220 android:orientation="horizontal" > |
221 | 221 |
222 <!--suppress ButtonStyle --> | 222 <!--suppress ButtonStyle --> |
223 <Button | 223 <Button |
224 android:id="@+id/negative_button" | 224 android:id="@+id/negative_button" |
225 style="@style/ButtonCompatBorderless" | 225 style="@style/ButtonCompatBorderless" |
226 android:layout_width="wrap_content" | 226 android:layout_width="wrap_content" |
227 android:layout_height="36dp" | 227 android:layout_height="36dp" |
| 228 android:paddingStart="@dimen/fre_button_padding" |
| 229 android:paddingEnd="@dimen/fre_button_padding" |
228 android:text="@string/fre_skip_text" | 230 android:text="@string/fre_skip_text" |
229 android:textAllCaps="true" | 231 android:textAllCaps="true" |
230 android:textColor="@color/light_active_color" | 232 android:textColor="@color/light_active_color" |
231 android:textSize="14sp"/> | 233 android:textSize="14sp"/> |
232 | 234 |
233 <View | 235 <View |
234 android:layout_width="0dp" | 236 android:layout_width="0dp" |
235 android:layout_height="0dp" | 237 android:layout_height="0dp" |
236 android:layout_weight="1" | 238 android:layout_weight="1" |
237 android:visibility="invisible"/> | 239 android:visibility="invisible"/> |
238 | 240 |
239 <FrameLayout | 241 <FrameLayout |
240 android:layout_width="wrap_content" | 242 android:layout_width="wrap_content" |
241 android:layout_height="wrap_content" | 243 android:layout_height="wrap_content" |
242 android:measureAllChildren="true"> | 244 android:measureAllChildren="true"> |
243 | 245 |
244 <!--suppress ButtonStyle --> | 246 <!--suppress ButtonStyle --> |
245 <org.chromium.ui.widget.ButtonCompat | 247 <org.chromium.ui.widget.ButtonCompat |
246 android:id="@+id/positive_button" | 248 android:id="@+id/positive_button" |
247 android:layout_width="wrap_content" | 249 android:layout_width="wrap_content" |
248 android:layout_height="36dp" | 250 android:layout_height="36dp" |
| 251 android:paddingStart="@dimen/fre_button_padding" |
| 252 android:paddingEnd="@dimen/fre_button_padding" |
249 android:text="@string/choose_account_sign_in" | 253 android:text="@string/choose_account_sign_in" |
250 android:textAllCaps="true" | 254 android:textAllCaps="true" |
251 android:textColor="@android:color/white" | 255 android:textColor="@android:color/white" |
252 android:textSize="14sp" | 256 android:textSize="14sp" |
253 chrome:buttonColor="@color/light_active_color" | 257 chrome:buttonColor="@color/light_active_color" |
254 chrome:buttonRaised="false"/> | 258 chrome:buttonRaised="false"/> |
255 | 259 |
256 <Button | 260 <Button |
257 android:id="@+id/more_button" | 261 android:id="@+id/more_button" |
258 style="@style/ButtonCompatBorderless" | 262 style="@style/ButtonCompatBorderless" |
259 android:layout_width="wrap_content" | 263 android:layout_width="wrap_content" |
260 android:layout_height="36dp" | 264 android:layout_height="36dp" |
261 android:text="@string/more" | 265 android:text="@string/more" |
262 android:textAllCaps="true" | 266 android:textAllCaps="true" |
263 android:textColor="@color/light_active_color" | 267 android:textColor="@color/light_active_color" |
264 android:textSize="14sp" | 268 android:textSize="14sp" |
265 android:drawableEnd="@drawable/down_arrow" | 269 android:drawableEnd="@drawable/down_arrow" |
266 android:drawablePadding="8dp" | 270 android:drawablePadding="8dp" |
267 android:visibility="gone"/> | 271 android:visibility="gone"/> |
268 </FrameLayout> | 272 </FrameLayout> |
269 | 273 |
270 <View | 274 <View |
271 android:id="@+id/positive_button_end_padding" | 275 android:id="@+id/positive_button_end_padding" |
272 android:layout_width="0dp" | 276 android:layout_width="0dp" |
273 android:layout_height="0dp" | 277 android:layout_height="0dp" |
274 android:layout_weight="1" | 278 android:layout_weight="1" |
275 android:visibility="gone"/> | 279 android:visibility="gone"/> |
276 </LinearLayout> | 280 </LinearLayout> |
277 | 281 |
278 </org.chromium.chrome.browser.signin.AccountSigninView> | 282 </org.chromium.chrome.browser.signin.AccountSigninView> |
OLD | NEW |