Chromium Code Reviews Chromium Code Reviews
Issue 2114493002:
[Payments] Update autofill/payments spacings (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@payments_ongoing| 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 | |
| 7 to work correctly for accessibility because FloatLabelLayout sometimes clea r hint. --> | |
| 8 <!--suppress ContentDescription --> | |
| 9 <merge | 6 <merge |
| 10 xmlns:android="http://schemas.android.com/apk/res/android" | 7 xmlns:android="http://schemas.android.com/apk/res/android" |
| 11 xmlns:app="http://schemas.android.com/apk/res-auto" > | 8 xmlns:app="http://schemas.android.com/apk/res-auto" > |
| 12 | 9 |
| 13 <!-- Editable fields for the profile --> | 10 <!-- Country --> |
| 14 <LinearLayout | 11 <include layout="@layout/payment_request_editor_dropdown" /> |
| 15 android:layout_width="match_parent" | |
| 16 android:layout_height="wrap_content" | |
| 17 android:orientation="vertical" | |
| 18 android:layout_marginStart="@dimen/pref_autofill_field_horizontal_paddin g" | |
| 19 android:layout_marginEnd="@dimen/pref_autofill_field_horizontal_padding" | |
| 20 android:paddingBottom="5dp" > | |
| 21 <TextView | |
| 22 android:layout_width="match_parent" | |
| 23 android:layout_height="wrap_content" | |
| 24 android:focusable="true" | |
| 25 android:textAppearance="@style/PreferenceFloatLabelTextAppearance" | |
| 26 android:text="@string/autofill_profile_editor_country" | |
| 27 android:paddingBottom="8dp" /> | |
| 28 <Spinner | |
| 29 android:id="@+id/countries" | |
| 30 android:layout_width="fill_parent" | |
| 31 android:layout_height="wrap_content" /> | |
| 32 <View style="@style/PreferenceSpinnerUnderlineView" /> | |
| 33 </LinearLayout> | |
| 34 | 12 |
| 13 <!-- Country specific address information | |
| 14 Bottom margins are handled by the views that are added to this layout. | |
| 15 --> | |
| 35 <LinearLayout | 16 <LinearLayout |
| 36 android:id="@+id/autofill_profile_widget_root" | 17 android:id="@+id/autofill_profile_widget_root" |
| 37 android:layout_width="match_parent" | 18 android:layout_width="match_parent" |
| 38 android:layout_height="wrap_content" | 19 android:layout_height="wrap_content" |
| 39 android:orientation="vertical" > | 20 android:orientation="vertical" /> |
| 40 </LinearLayout> | |
| 41 | 21 |
| 22 <!-- Phone number --> | |
| 42 <org.chromium.chrome.browser.widget.CompatibilityTextInputLayout | 23 <org.chromium.chrome.browser.widget.CompatibilityTextInputLayout |
| 43 android:id="@+id/phone_number_label" | 24 android:id="@+id/phone_number_label" |
| 44 android:layout_width="match_parent" | 25 android:layout_width="match_parent" |
| 45 android:layout_height="wrap_content" > | 26 android:layout_height="wrap_content" |
| 27 android:layout_marginBottom="@dimen/pref_autofill_content_spacing" > | |
| 28 | |
| 46 <EditText | 29 <EditText |
| 47 android:id="@+id/phone_number_edit" | 30 android:id="@+id/phone_number_edit" |
| 48 android:layout_width="match_parent" | 31 android:layout_width="match_parent" |
| 49 android:layout_height="wrap_content" | 32 android:layout_height="wrap_content" |
| 50 android:imeOptions="flagNoExtractUi" | 33 android:imeOptions="flagNoExtractUi" |
| 51 android:inputType="phone" | 34 android:inputType="phone" |
| 52 android:singleLine="true" | 35 android:singleLine="true" |
| 53 android:hint="@string/autofill_profile_editor_phone_number" /> | 36 android:hint="@string/autofill_profile_editor_phone_number" |
| 37 android:focusable="true" | |
|
Ian Wen
2016/07/06 22:04:39
Remove these since EditTexts are already focusable
gone
2016/07/06 22:08:01
Done.
| |
| 38 android:focusableInTouchMode="true" /> | |
| 39 | |
| 54 </org.chromium.chrome.browser.widget.CompatibilityTextInputLayout> | 40 </org.chromium.chrome.browser.widget.CompatibilityTextInputLayout> |
| 55 | 41 |
| 42 <!-- Email address --> | |
| 56 <org.chromium.chrome.browser.widget.CompatibilityTextInputLayout | 43 <org.chromium.chrome.browser.widget.CompatibilityTextInputLayout |
| 57 android:id="@+id/email_address_label" | 44 android:id="@+id/email_address_label" |
| 58 android:layout_width="match_parent" | 45 android:layout_width="match_parent" |
| 59 android:layout_height="wrap_content" > | 46 android:layout_height="wrap_content" > |
| 47 | |
| 60 <EditText | 48 <EditText |
| 61 android:id="@+id/email_address_edit" | 49 android:id="@+id/email_address_edit" |
| 62 android:layout_width="match_parent" | 50 android:layout_width="match_parent" |
| 63 android:layout_height="wrap_content" | 51 android:layout_height="wrap_content" |
| 64 android:imeOptions="flagNoExtractUi" | 52 android:imeOptions="flagNoExtractUi" |
| 65 android:inputType="textEmailAddress" | 53 android:inputType="textEmailAddress" |
| 66 android:singleLine="true" | 54 android:singleLine="true" |
| 67 android:hint="@string/autofill_profile_editor_email_address" /> | 55 android:hint="@string/autofill_profile_editor_email_address" |
| 56 android:focusable="true" | |
| 57 android:focusableInTouchMode="true" /> | |
| 58 | |
| 68 </org.chromium.chrome.browser.widget.CompatibilityTextInputLayout> | 59 </org.chromium.chrome.browser.widget.CompatibilityTextInputLayout> |
| 69 | 60 |
| 70 </merge> | 61 </merge> |
| OLD | NEW |
