| 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 <TextView | 7 <TextView |
| 8 android:layout_width="match_parent" | 8 android:layout_width="match_parent" |
| 9 android:layout_height="wrap_content" | 9 android:layout_height="wrap_content" |
| 10 android:layout_marginTop="@dimen/pref_autofill_field_top_padding" | 10 android:layout_marginTop="@dimen/pref_autofill_field_top_margin" |
| 11 android:layout_marginStart="@dimen/pref_autofill_field_horizontal_paddin
g" | 11 android:layout_marginStart="@dimen/pref_autofill_field_horizontal_paddin
g" |
| 12 android:layout_marginEnd="@dimen/pref_autofill_field_horizontal_padding" | 12 android:layout_marginEnd="@dimen/pref_autofill_field_horizontal_padding" |
| 13 android:focusable="true" | 13 android:labelFor="@+id/autofill_credit_card_editor_billing_address_spinn
er" |
| 14 android:textAppearance="@style/PreferenceFloatLabelTextAppearance" | 14 android:textAppearance="@style/PreferenceFloatLabelTextAppearance" |
| 15 android:text="@string/autofill_credit_card_editor_billing_address" /> | 15 android:text="@string/autofill_credit_card_editor_billing_address" /> |
| 16 | 16 |
| 17 <android.support.v7.widget.AppCompatSpinner | 17 <android.support.v7.widget.AppCompatSpinner |
| 18 android:id="@+id/autofill_credit_card_editor_billing_address_spinner" | 18 android:id="@+id/autofill_credit_card_editor_billing_address_spinner" |
| 19 android:layout_width="match_parent" | 19 android:layout_width="match_parent" |
| 20 android:layout_height="wrap_content" | 20 android:layout_height="wrap_content" |
| 21 android:layout_marginTop="@dimen/pref_autofill_field_top_padding" | 21 android:layout_marginTop="@dimen/pref_autofill_field_top_margin" |
| 22 android:layout_marginStart="@dimen/pref_autofill_field_horizontal_paddin
g" | 22 android:layout_marginStart="@dimen/pref_autofill_field_horizontal_paddin
g" |
| 23 android:layout_marginEnd="@dimen/pref_autofill_field_horizontal_padding" | 23 android:layout_marginEnd="@dimen/pref_autofill_field_horizontal_padding" |
| 24 android:focusable="true" |
| 25 android:focusableInTouchMode="true" |
| 24 android:textDirection="locale" /> | 26 android:textDirection="locale" /> |
| 25 | 27 |
| 26 <View style="@style/PreferenceSpinnerUnderlineView" | 28 <View style="@style/PreferenceSpinnerUnderlineView" |
| 27 android:layout_marginStart="@dimen/pref_autofill_field_horizontal_paddin
g" | 29 android:layout_marginStart="@dimen/pref_autofill_field_horizontal_paddin
g" |
| 28 android:layout_marginEnd="@dimen/pref_autofill_field_horizontal_padding"
/> | 30 android:layout_marginEnd="@dimen/pref_autofill_field_horizontal_padding"
/> |
| 29 </merge> | 31 </merge> |
| OLD | NEW |