Chromium Code Reviews Chromium Code Reviews
Issue 2109643003:
Add billing address to masked server credit cards. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| 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 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 | 9 <merge xmlns:android="http://schemas.android.com/apk/res/android"> |
| 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.FloatLabelLayout | 10 <org.chromium.chrome.browser.widget.FloatLabelLayout |
| 14 android:id="@+id/credit_card_name_label" | 11 android:id="@+id/credit_card_name_label" |
| 15 android:layout_width="match_parent" | 12 android:layout_width="match_parent" |
| 16 android:layout_height="wrap_content" > | 13 android:layout_height="wrap_content"> |
| 17 <EditText | 14 <EditText |
| 18 android:id="@+id/credit_card_name_edit" | 15 android:id="@+id/credit_card_name_edit" |
| 19 android:layout_width="match_parent" | 16 android:layout_width="match_parent" |
| 20 android:layout_height="wrap_content" | 17 android:layout_height="wrap_content" |
| 21 android:imeOptions="flagNoExtractUi" | 18 android:imeOptions="flagNoExtractUi" |
| 22 android:inputType="textCapWords" | 19 android:inputType="textCapWords" |
| 23 android:hint="@string/autofill_credit_card_editor_name" /> | 20 android:hint="@string/autofill_credit_card_editor_name"/> |
|
gone
2016/06/30 17:26:36
I've generally seen the space kept when you have t
please use gerrit instead
2016/06/30 18:36:27
Done.
| |
| 24 </org.chromium.chrome.browser.widget.FloatLabelLayout> | 21 </org.chromium.chrome.browser.widget.FloatLabelLayout> |
| 25 | 22 |
| 26 <org.chromium.chrome.browser.widget.FloatLabelLayout | 23 <org.chromium.chrome.browser.widget.FloatLabelLayout |
| 27 android:id="@+id/credit_card_number_label" | 24 android:id="@+id/credit_card_number_label" |
| 28 android:layout_width="match_parent" | 25 android:layout_width="match_parent" |
| 29 android:layout_height="wrap_content" > | 26 android:layout_height="wrap_content"> |
| 30 <EditText | 27 <EditText |
| 31 android:id="@+id/credit_card_number_edit" | 28 android:id="@+id/credit_card_number_edit" |
| 32 android:layout_width="match_parent" | 29 android:layout_width="match_parent" |
| 33 android:layout_height="wrap_content" | 30 android:layout_height="wrap_content" |
| 34 android:imeOptions="flagNoExtractUi" | 31 android:imeOptions="flagNoExtractUi" |
| 35 android:inputType="phone" | 32 android:inputType="phone" |
| 36 android:digits="0123456789- " | 33 android:digits="0123456789- " |
| 37 android:hint="@string/autofill_credit_card_editor_number" /> | 34 android:hint="@string/autofill_credit_card_editor_number"/> |
| 38 </org.chromium.chrome.browser.widget.FloatLabelLayout> | 35 </org.chromium.chrome.browser.widget.FloatLabelLayout> |
| 39 | 36 |
| 40 <TextView | 37 <TextView |
| 38 android:id="@+id/credit_card_expiration_label" | |
| 41 android:layout_width="match_parent" | 39 android:layout_width="match_parent" |
| 42 android:layout_height="wrap_content" | 40 android:layout_height="wrap_content" |
| 43 android:focusable="true" | 41 android:focusable="true" |
| 44 android:paddingTop="@dimen/pref_autofill_field_top_padding" | 42 android:paddingTop="@dimen/pref_autofill_field_top_padding" |
| 45 android:textAppearance="@style/PreferenceFloatLabelTextAppearance" | 43 android:textAppearance="@style/PreferenceFloatLabelTextAppearance" |
| 46 android:text="@string/autofill_credit_card_editor_expiration_date" | 44 android:text="@string/autofill_credit_card_editor_expiration_date" |
| 47 android:paddingStart="@dimen/pref_autofill_field_horizontal_padding" | 45 android:paddingStart="@dimen/pref_autofill_field_horizontal_padding" |
| 48 android:paddingEnd="@dimen/pref_autofill_field_horizontal_padding" /> | 46 android:paddingEnd="@dimen/pref_autofill_field_horizontal_padding"/> |
| 49 | 47 |
| 50 <LinearLayout | 48 <LinearLayout |
| 49 android:id="@+id/credit_card_expiration_container" | |
| 51 android:layout_width="match_parent" | 50 android:layout_width="match_parent" |
| 52 android:layout_height="wrap_content" | 51 android:layout_height="wrap_content" |
| 53 android:orientation="horizontal" | 52 android:orientation="horizontal" |
| 54 android:paddingTop="8dp" | 53 android:paddingTop="8dp" |
| 55 android:baselineAligned="false" | 54 android:baselineAligned="false" |
| 56 android:layout_marginStart="@dimen/pref_autofill_field_horizontal_paddin g" | 55 android:layout_marginStart="@dimen/pref_autofill_field_horizontal_paddin g" |
| 57 android:layout_marginEnd="@dimen/pref_autofill_field_horizontal_padding" > | 56 android:layout_marginEnd="@dimen/pref_autofill_field_horizontal_padding" > |
| 58 | 57 |
| 59 <LinearLayout | 58 <LinearLayout |
| 60 android:layout_width="0dp" | 59 android:layout_width="0dp" |
| 61 android:layout_height="wrap_content" | 60 android:layout_height="wrap_content" |
| 62 android:layout_weight="1" | 61 android:layout_weight="1" |
| 63 android:orientation="vertical" | 62 android:orientation="vertical" |
| 64 android:paddingEnd="10dp" > | 63 android:paddingEnd="10dp"> |
| 65 <android.support.v7.widget.AppCompatSpinner | 64 <android.support.v7.widget.AppCompatSpinner |
| 66 android:id="@+id/autofill_credit_card_editor_month_spinner" | 65 android:id="@+id/autofill_credit_card_editor_month_spinner" |
| 67 android:layout_width="match_parent" | 66 android:layout_width="match_parent" |
| 68 android:layout_height="wrap_content" /> | 67 android:layout_height="wrap_content"/> |
| 69 <View style="@style/PreferenceSpinnerUnderlineView" /> | 68 <View style="@style/PreferenceSpinnerUnderlineView"/> |
| 70 </LinearLayout> | 69 </LinearLayout> |
| 71 | 70 |
| 72 <LinearLayout | 71 <LinearLayout |
| 73 android:layout_width="0dp" | 72 android:layout_width="0dp" |
| 74 android:layout_height="wrap_content" | 73 android:layout_height="wrap_content" |
| 75 android:layout_weight="1" | 74 android:layout_weight="1" |
| 76 android:orientation="vertical" > | 75 android:orientation="vertical"> |
| 77 <android.support.v7.widget.AppCompatSpinner | 76 <android.support.v7.widget.AppCompatSpinner |
| 78 android:id="@+id/autofill_credit_card_editor_year_spinner" | 77 android:id="@+id/autofill_credit_card_editor_year_spinner" |
| 79 android:layout_width="match_parent" | 78 android:layout_width="match_parent" |
| 80 android:layout_height="wrap_content" /> | 79 android:layout_height="wrap_content" /> |
| 81 <View style="@style/PreferenceSpinnerUnderlineView" /> | 80 <View style="@style/PreferenceSpinnerUnderlineView"/> |
| 82 </LinearLayout> | 81 </LinearLayout> |
| 83 </LinearLayout> | 82 </LinearLayout> |
| 84 | 83 |
| 85 <TextView | 84 <include layout="@layout/autofill_billing_address_dropdown"/> |
| 86 android:layout_width="match_parent" | |
| 87 android:layout_height="wrap_content" | |
| 88 android:focusable="true" | |
| 89 android:paddingTop="@dimen/pref_autofill_field_top_padding" | |
| 90 android:textAppearance="@style/PreferenceFloatLabelTextAppearance" | |
| 91 android:text="@string/autofill_credit_card_editor_billing_address" | |
| 92 android:paddingStart="@dimen/pref_autofill_field_horizontal_padding" | |
| 93 android:paddingEnd="@dimen/pref_autofill_field_horizontal_padding" /> | |
| 94 | |
| 95 <android.support.v7.widget.AppCompatSpinner | |
| 96 android:id="@+id/autofill_credit_card_editor_billing_address_spinner" | |
| 97 android:layout_width="match_parent" | |
| 98 android:layout_height="wrap_content" | |
| 99 android:paddingTop="@dimen/pref_autofill_field_top_padding" | |
| 100 android:paddingStart="@dimen/pref_autofill_field_horizontal_padding" | |
| 101 android:paddingEnd="@dimen/pref_autofill_field_horizontal_padding" | |
| 102 android:textDirection="locale" /> | |
| 103 <View style="@style/PreferenceSpinnerUnderlineView" | |
| 104 android:paddingStart="@dimen/pref_autofill_field_horizontal_padding" | |
| 105 android:paddingEnd="@dimen/pref_autofill_field_horizontal_padding" /> | |
| 106 | |
| 107 </merge> | 85 </merge> |
| OLD | NEW |
