| OLD | NEW |
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- Copyright (c) 2013 The Chromium Authors. All rights reserved. | 2 <!-- Copyright (c) 2013 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 <merge xmlns:android="http://schemas.android.com/apk/res/android"> | 7 <org.chromium.chrome.browser.autofill.AutofillDialogTitleView xmlns:android="htt
p://schemas.android.com/apk/res/android" |
| 8 <FrameLayout | 8 android:id="@+id/title" |
| 9 android:layout_width="match_parent" |
| 10 android:layout_height="@dimen/autofill_dialog_title_height" |
| 11 android:minHeight="@dimen/autofill_dialog_title_height"> |
| 12 <ImageView |
| 13 android:id="@+id/accounts_logo" |
| 14 android:layout_width="wrap_content" |
| 15 android:layout_height="32dp" |
| 16 android:layout_gravity="left|center_vertical" |
| 17 android:layout_margin="@dimen/autofill_steady_margin" |
| 18 android:scaleType="centerInside" |
| 19 android:src="@drawable/wallet_logo"/> |
| 20 <Spinner |
| 21 android:id="@+id/accounts_spinner" |
| 22 android:layout_width="232dp" |
| 23 android:layout_height="wrap_content" |
| 24 android:layout_gravity="right|center_vertical" |
| 25 android:layout_margin="@dimen/autofill_steady_margin"/> |
| 26 <View |
| 27 android:id="@+id/line_top" |
| 9 android:layout_width="match_parent" | 28 android:layout_width="match_parent" |
| 10 android:layout_height="wrap_content"> | 29 android:layout_height="1dp" |
| 11 <ImageView | 30 android:layout_gravity="bottom|fill_horizontal" |
| 12 android:id="@+id/accounts_logo" | 31 android:background="#D9D9DC"/> |
| 13 android:layout_width="wrap_content" | 32 </org.chromium.chrome.browser.autofill.AutofillDialogTitleView> |
| 14 android:layout_height="32dp" | |
| 15 android:layout_gravity="left" | |
| 16 android:layout_margin="@dimen/autofill_steady_margin" | |
| 17 android:scaleType="centerInside" | |
| 18 android:src="@drawable/wallet_logo"/> | |
| 19 <Spinner | |
| 20 android:id="@+id/accounts_spinner" | |
| 21 android:layout_width="232dp" | |
| 22 android:layout_height="wrap_content" | |
| 23 android:layout_gravity="right" | |
| 24 android:layout_margin="@dimen/autofill_steady_margin"/> | |
| 25 </FrameLayout> | |
| 26 </merge> | |
| OLD | NEW |