OLD | NEW |
1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
2 <!-- Copyright 2014 The Chromium Authors. All rights reserved. | 2 <!-- Copyright 2014 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 <!-- EditText views in FloatLabelLayout require both hint and contentDescription
to be set | 6 <!-- EditText views in FloatLabelLayout require both hint and contentDescription
to be set |
7 to work correctly for accessibility because FloatLabelLayout sometimes clea
r hint. --> | 7 to work correctly for accessibility because FloatLabelLayout sometimes clea
r hint. --> |
8 <!--suppress ContentDescription --> | 8 <!--suppress ContentDescription --> |
9 <merge | 9 <merge |
10 xmlns:android="http://schemas.android.com/apk/res/android" | 10 xmlns:android="http://schemas.android.com/apk/res/android" |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 android:baselineAligned="false" | 55 android:baselineAligned="false" |
56 android:layout_marginStart="@dimen/pref_autofill_field_horizontal_paddin
g" | 56 android:layout_marginStart="@dimen/pref_autofill_field_horizontal_paddin
g" |
57 android:layout_marginEnd="@dimen/pref_autofill_field_horizontal_padding"
> | 57 android:layout_marginEnd="@dimen/pref_autofill_field_horizontal_padding"
> |
58 | 58 |
59 <LinearLayout | 59 <LinearLayout |
60 android:layout_width="0dp" | 60 android:layout_width="0dp" |
61 android:layout_height="wrap_content" | 61 android:layout_height="wrap_content" |
62 android:layout_weight="1" | 62 android:layout_weight="1" |
63 android:orientation="vertical" | 63 android:orientation="vertical" |
64 android:paddingEnd="10dp" > | 64 android:paddingEnd="10dp" > |
65 <Spinner | 65 <android.support.v7.widget.AppCompatSpinner |
66 android:id="@+id/autofill_credit_card_editor_month_spinner" | 66 android:id="@+id/autofill_credit_card_editor_month_spinner" |
67 android:layout_width="match_parent" | 67 android:layout_width="match_parent" |
68 android:layout_height="wrap_content" /> | 68 android:layout_height="wrap_content" /> |
69 <View style="@style/PreferenceSpinnerUnderlineView" /> | 69 <View style="@style/PreferenceSpinnerUnderlineView" /> |
70 </LinearLayout> | 70 </LinearLayout> |
71 | 71 |
72 <LinearLayout | 72 <LinearLayout |
73 android:layout_width="0dp" | 73 android:layout_width="0dp" |
74 android:layout_height="wrap_content" | 74 android:layout_height="wrap_content" |
75 android:layout_weight="1" | 75 android:layout_weight="1" |
76 android:orientation="vertical" > | 76 android:orientation="vertical" > |
77 <Spinner | 77 <android.support.v7.widget.AppCompatSpinner |
78 android:id="@+id/autofill_credit_card_editor_year_spinner" | 78 android:id="@+id/autofill_credit_card_editor_year_spinner" |
79 android:layout_width="match_parent" | 79 android:layout_width="match_parent" |
80 android:layout_height="wrap_content" /> | 80 android:layout_height="wrap_content" /> |
81 <View style="@style/PreferenceSpinnerUnderlineView" /> | 81 <View style="@style/PreferenceSpinnerUnderlineView" /> |
82 </LinearLayout> | 82 </LinearLayout> |
83 </LinearLayout> | 83 </LinearLayout> |
84 | 84 |
85 <TextView | 85 <TextView |
86 android:layout_width="match_parent" | 86 android:layout_width="match_parent" |
87 android:layout_height="wrap_content" | 87 android:layout_height="wrap_content" |
88 android:focusable="true" | 88 android:focusable="true" |
89 android:paddingTop="@dimen/pref_autofill_field_top_padding" | 89 android:paddingTop="@dimen/pref_autofill_field_top_padding" |
90 android:textAppearance="@style/PreferenceFloatLabelTextAppearance" | 90 android:textAppearance="@style/PreferenceFloatLabelTextAppearance" |
91 android:text="@string/autofill_credit_card_editor_billing_address" | 91 android:text="@string/autofill_credit_card_editor_billing_address" |
92 android:paddingStart="@dimen/pref_autofill_field_horizontal_padding" | 92 android:paddingStart="@dimen/pref_autofill_field_horizontal_padding" |
93 android:paddingEnd="@dimen/pref_autofill_field_horizontal_padding" /> | 93 android:paddingEnd="@dimen/pref_autofill_field_horizontal_padding" /> |
94 | 94 |
95 <Spinner | 95 <android.support.v7.widget.AppCompatSpinner |
96 android:id="@+id/autofill_credit_card_editor_billing_address_spinner" | 96 android:id="@+id/autofill_credit_card_editor_billing_address_spinner" |
97 android:layout_width="match_parent" | 97 android:layout_width="match_parent" |
98 android:layout_height="wrap_content" | 98 android:layout_height="wrap_content" |
99 android:paddingTop="@dimen/pref_autofill_field_top_padding" | 99 android:paddingTop="@dimen/pref_autofill_field_top_padding" |
100 android:paddingStart="@dimen/pref_autofill_field_horizontal_padding" | 100 android:paddingStart="@dimen/pref_autofill_field_horizontal_padding" |
101 android:paddingEnd="@dimen/pref_autofill_field_horizontal_padding" /> | 101 android:paddingEnd="@dimen/pref_autofill_field_horizontal_padding" |
| 102 android:textDirection="locale" /> |
102 <View style="@style/PreferenceSpinnerUnderlineView" | 103 <View style="@style/PreferenceSpinnerUnderlineView" |
103 android:paddingStart="@dimen/pref_autofill_field_horizontal_padding" | 104 android:paddingStart="@dimen/pref_autofill_field_horizontal_padding" |
104 android:paddingEnd="@dimen/pref_autofill_field_horizontal_padding" /> | 105 android:paddingEnd="@dimen/pref_autofill_field_horizontal_padding" /> |
105 | 106 |
106 </merge> | 107 </merge> |
OLD | NEW |