Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3130)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java

Issue 2462473002: [Payments] Don't show select when clicking in billing address drop. (Closed)
Patch Set: Addressed comments Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java
index 071705d26e5f18f0c180008612f605713e25e386..7321cf72d64ce070f1a8f90d793479d9e544c41a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java
@@ -67,9 +67,6 @@ public class CardEditor extends EditorBase<AutofillPaymentInstrument>
}
}
- /** The dropdown key that indicates absence of billing address. */
- private static final String BILLING_ADDRESS_NONE = "";
-
/** The dropdown key that triggers the address editor to add a new billing address. */
private static final String BILLING_ADDRESS_ADD_NEW = "add";
@@ -455,7 +452,8 @@ public class CardEditor extends EditorBase<AutofillPaymentInstrument>
// Expiration year dropdown is side-by-side with the expiration year dropdown. The dropdown
// should include the card's expiration year, so it's not cached.
mYearField = EditorFieldModel.createDropdown(
- null /* label */, buildYearDropdownKeyValues(calendar, card.getYear()));
+ null /* label */, buildYearDropdownKeyValues(calendar, card.getYear()),
+ null /* hint */);
mYearField.setIsFullLine(false);
if (mYearField.getDropdownKeys().contains(card.getYear())) {
mYearField.setValue(card.getYear());
@@ -516,8 +514,6 @@ public class CardEditor extends EditorBase<AutofillPaymentInstrument>
*/
private void addBillingAddressDropdown(EditorModel editor, final CreditCard card) {
final List<DropdownKeyValue> billingAddresses = new ArrayList<>();
- billingAddresses.add(new DropdownKeyValue(BILLING_ADDRESS_NONE,
- mContext.getString(R.string.select)));
for (Map.Entry<String, AutofillProfile> address : mProfilesForBillingAddress.entrySet()) {
// Key is profile GUID. Value is profile label.
@@ -529,10 +525,10 @@ public class CardEditor extends EditorBase<AutofillPaymentInstrument>
mContext.getString(R.string.autofill_create_profile)));
// Don't cache the billing address dropdown, because the user may have added or removed
- // profiles.
+ // profiles. Also pass the "Select" dropdown item as a hint to the dropdown constructor.
mBillingAddressField = EditorFieldModel.createDropdown(
mContext.getString(R.string.autofill_credit_card_editor_billing_address),
- billingAddresses);
+ billingAddresses, mContext.getString(R.string.select));
// The billing address is required.
mBillingAddressField.setRequiredErrorMessage(

Powered by Google App Engine
This is Rietveld 408576698