| 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 <!-- 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 xmlns:android="http://schemas.android.com/apk/res/android"> | 9 <merge |
| 10 <org.chromium.chrome.browser.widget.FloatLabelLayout | 10 xmlns:android="http://schemas.android.com/apk/res/android" |
| 11 xmlns:app="http://schemas.android.com/apk/res-auto"> |
| 12 |
| 13 <org.chromium.chrome.browser.widget.CompatibilityTextInputLayout |
| 11 android:id="@+id/credit_card_name_label" | 14 android:id="@+id/credit_card_name_label" |
| 12 android:layout_width="match_parent" | 15 android:layout_width="match_parent" |
| 13 android:layout_height="wrap_content"> | 16 android:layout_height="wrap_content"> |
| 14 <EditText | 17 <EditText |
| 15 android:id="@+id/credit_card_name_edit" | 18 android:id="@+id/credit_card_name_edit" |
| 16 android:layout_width="match_parent" | 19 android:layout_width="match_parent" |
| 17 android:layout_height="wrap_content" | 20 android:layout_height="wrap_content" |
| 18 android:imeOptions="flagNoExtractUi" | 21 android:imeOptions="flagNoExtractUi" |
| 19 android:inputType="textCapWords" | 22 android:inputType="textCapWords" |
| 20 android:hint="@string/autofill_credit_card_editor_name" /> | 23 android:hint="@string/autofill_credit_card_editor_name" /> |
| 21 </org.chromium.chrome.browser.widget.FloatLabelLayout> | 24 </org.chromium.chrome.browser.widget.CompatibilityTextInputLayout> |
| 22 | 25 |
| 23 <org.chromium.chrome.browser.widget.FloatLabelLayout | 26 <org.chromium.chrome.browser.widget.CompatibilityTextInputLayout |
| 24 android:id="@+id/credit_card_number_label" | 27 android:id="@+id/credit_card_number_label" |
| 25 android:layout_width="match_parent" | 28 android:layout_width="match_parent" |
| 26 android:layout_height="wrap_content"> | 29 android:layout_height="wrap_content"> |
| 27 <EditText | 30 <EditText |
| 28 android:id="@+id/credit_card_number_edit" | 31 android:id="@+id/credit_card_number_edit" |
| 29 android:layout_width="match_parent" | 32 android:layout_width="match_parent" |
| 30 android:layout_height="wrap_content" | 33 android:layout_height="wrap_content" |
| 31 android:imeOptions="flagNoExtractUi" | 34 android:imeOptions="flagNoExtractUi" |
| 32 android:inputType="phone" | 35 android:inputType="phone" |
| 33 android:digits="0123456789- " | 36 android:digits="0123456789- " |
| 34 android:hint="@string/autofill_credit_card_editor_number" /> | 37 android:hint="@string/autofill_credit_card_editor_number" /> |
| 35 </org.chromium.chrome.browser.widget.FloatLabelLayout> | 38 </org.chromium.chrome.browser.widget.CompatibilityTextInputLayout> |
| 36 | 39 |
| 37 <TextView | 40 <TextView |
| 38 android:id="@+id/credit_card_expiration_label" | 41 android:id="@+id/credit_card_expiration_label" |
| 39 android:layout_width="match_parent" | 42 android:layout_width="match_parent" |
| 40 android:layout_height="wrap_content" | 43 android:layout_height="wrap_content" |
| 44 android:layout_marginStart="@dimen/pref_autofill_field_horizontal_paddin
g" |
| 45 android:layout_marginEnd="@dimen/pref_autofill_field_horizontal_padding" |
| 41 android:focusable="true" | 46 android:focusable="true" |
| 42 android:paddingTop="@dimen/pref_autofill_field_top_padding" | |
| 43 android:textAppearance="@style/PreferenceFloatLabelTextAppearance" | 47 android:textAppearance="@style/PreferenceFloatLabelTextAppearance" |
| 44 android:text="@string/autofill_credit_card_editor_expiration_date" | 48 android:text="@string/autofill_credit_card_editor_expiration_date" /> |
| 45 android:paddingStart="@dimen/pref_autofill_field_horizontal_padding" | |
| 46 android:paddingEnd="@dimen/pref_autofill_field_horizontal_padding" /> | |
| 47 | 49 |
| 48 <LinearLayout | 50 <LinearLayout |
| 49 android:id="@+id/credit_card_expiration_container" | 51 android:id="@+id/credit_card_expiration_container" |
| 50 android:layout_width="match_parent" | 52 android:layout_width="match_parent" |
| 51 android:layout_height="wrap_content" | 53 android:layout_height="wrap_content" |
| 54 android:layout_marginStart="@dimen/pref_autofill_field_horizontal_paddin
g" |
| 55 android:layout_marginEnd="@dimen/pref_autofill_field_horizontal_padding" |
| 52 android:orientation="horizontal" | 56 android:orientation="horizontal" |
| 53 android:paddingTop="8dp" | 57 android:paddingTop="8dp" |
| 54 android:baselineAligned="false" | 58 android:baselineAligned="false"> |
| 55 android:layout_marginStart="@dimen/pref_autofill_field_horizontal_paddin
g" | |
| 56 android:layout_marginEnd="@dimen/pref_autofill_field_horizontal_padding"
> | |
| 57 | 59 |
| 58 <LinearLayout | 60 <LinearLayout |
| 59 android:layout_width="0dp" | 61 android:layout_width="0dp" |
| 60 android:layout_height="wrap_content" | 62 android:layout_height="wrap_content" |
| 61 android:layout_weight="1" | 63 android:layout_weight="1" |
| 62 android:orientation="vertical" | 64 android:orientation="vertical" |
| 63 android:paddingEnd="10dp"> | 65 android:layout_marginEnd="@dimen/payments_section_large_spacing"> |
| 66 |
| 64 <android.support.v7.widget.AppCompatSpinner | 67 <android.support.v7.widget.AppCompatSpinner |
| 65 android:id="@+id/autofill_credit_card_editor_month_spinner" | 68 android:id="@+id/autofill_credit_card_editor_month_spinner" |
| 66 android:layout_width="match_parent" | 69 android:layout_width="match_parent" |
| 67 android:layout_height="wrap_content" /> | 70 android:layout_height="wrap_content" /> |
| 71 |
| 68 <View style="@style/PreferenceSpinnerUnderlineView" /> | 72 <View style="@style/PreferenceSpinnerUnderlineView" /> |
| 73 |
| 69 </LinearLayout> | 74 </LinearLayout> |
| 70 | 75 |
| 71 <LinearLayout | 76 <LinearLayout |
| 72 android:layout_width="0dp" | 77 android:layout_width="0dp" |
| 73 android:layout_height="wrap_content" | 78 android:layout_height="wrap_content" |
| 74 android:layout_weight="1" | 79 android:layout_weight="1" |
| 75 android:orientation="vertical"> | 80 android:orientation="vertical"> |
| 76 <android.support.v7.widget.AppCompatSpinner | 81 <android.support.v7.widget.AppCompatSpinner |
| 77 android:id="@+id/autofill_credit_card_editor_year_spinner" | 82 android:id="@+id/autofill_credit_card_editor_year_spinner" |
| 78 android:layout_width="match_parent" | 83 android:layout_width="match_parent" |
| 79 android:layout_height="wrap_content" /> | 84 android:layout_height="wrap_content" /> |
| 80 <View style="@style/PreferenceSpinnerUnderlineView" /> | 85 <View style="@style/PreferenceSpinnerUnderlineView" /> |
| 81 </LinearLayout> | 86 </LinearLayout> |
| 82 </LinearLayout> | 87 </LinearLayout> |
| 83 | 88 |
| 84 <include layout="@layout/autofill_billing_address_dropdown" /> | 89 <include layout="@layout/autofill_billing_address_dropdown" /> |
| 85 </merge> | 90 </merge> |
| OLD | NEW |