| OLD | NEW |
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- Copyright 2016 The Chromium Authors. All rights reserved. | 2 <!-- Copyright 2016 The Chromium Authors. All rights reserved. |
| 3 Use of this source code is governed by a BSD-style license that can be | 3 Use of this source code is governed by a BSD-style license that can be |
| 4 found in the LICENSE file. --> | 4 found in the LICENSE file. --> |
| 5 | 5 |
| 6 <merge xmlns:android="http://schemas.android.com/apk/res/android"> | 6 <merge xmlns:android="http://schemas.android.com/apk/res/android"> |
| 7 <!-- Name of the card (type + obfuscated number) --> |
| 7 <TextView | 8 <TextView |
| 8 android:id="@+id/title" | 9 android:id="@+id/title" |
| 9 android:layout_width="match_parent" | 10 android:layout_width="match_parent" |
| 10 android:layout_height="wrap_content" | 11 android:layout_height="wrap_content" |
| 12 android:layout_marginTop="@dimen/pref_autofill_field_large_top_margin" |
| 11 style="@style/PreferenceTitle" /> | 13 style="@style/PreferenceTitle" /> |
| 12 | 14 |
| 13 <TextView | 15 <TextView |
| 14 android:id="@+id/summary" | 16 android:id="@+id/summary" |
| 15 android:layout_width="match_parent" | 17 android:layout_width="match_parent" |
| 16 android:layout_height="wrap_content" | 18 android:layout_height="wrap_content" |
| 17 style="@style/PreferenceSummary" | 19 style="@style/PreferenceSummary" |
| 18 android:layout_marginBottom="@dimen/pref_autofill_field_top_margin" /> | 20 android:layout_marginBottom="@dimen/pref_autofill_field_bottom_margin" /
> |
| 19 | 21 |
| 20 <include layout="@layout/autofill_billing_address_dropdown" /> | 22 <include layout="@layout/autofill_billing_address_dropdown" /> |
| 21 | 23 |
| 22 <RelativeLayout | 24 <RelativeLayout |
| 23 android:layout_width="match_parent" | 25 android:layout_width="match_parent" |
| 24 android:layout_height="wrap_content" | 26 android:layout_height="wrap_content" |
| 25 android:layout_marginTop="@dimen/pref_autofill_field_top_margin"> | 27 android:layout_marginTop="@dimen/pref_autofill_field_top_margin"> |
| 26 | 28 |
| 27 <TextView | 29 <TextView |
| 28 android:id="@+id/edit_server_card" | 30 android:id="@+id/edit_server_card" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 android:layout_height="wrap_content" | 70 android:layout_height="wrap_content" |
| 69 android:layout_alignParentStart="true" | 71 android:layout_alignParentStart="true" |
| 70 android:layout_below="@id/server_card_label" | 72 android:layout_below="@id/server_card_label" |
| 71 android:layout_toStartOf="@id/clear_local_copy" | 73 android:layout_toStartOf="@id/clear_local_copy" |
| 72 android:paddingTop="@dimen/pref_autofill_touch_target_padding" | 74 android:paddingTop="@dimen/pref_autofill_touch_target_padding" |
| 73 android:paddingBottom="@dimen/pref_autofill_touch_target_padding" | 75 android:paddingBottom="@dimen/pref_autofill_touch_target_padding" |
| 74 style="@style/PreferenceTitle" | 76 style="@style/PreferenceTitle" |
| 75 android:text="@string/autofill_describe_local_copy" /> | 77 android:text="@string/autofill_describe_local_copy" /> |
| 76 </RelativeLayout> | 78 </RelativeLayout> |
| 77 </merge> | 79 </merge> |
| OLD | NEW |