Credit card editor for PaymentRequest UI.

chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDropdownField.java

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDropdownField.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDropdownField.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDropdownField.java
index c853391e2b1f990cfb5ed8e9ca81d463dae34e98..8a74acd78109fba555bc13bd8659131c35603b3a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDropdownField.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorDropdownField.java
@@ -7,6 +7,8 @@ package org.chromium.chrome.browser.payments.ui;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityEvent;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
@@ -21,7 +23,7 @@ import java.util.List;
 /**
  * Helper class for creating a dropdown view with a label.
  */
-class EditorDropdownField {
+class EditorDropdownField implements Validatable {
     private final EditorFieldModel mFieldModel;
     private final View mLayout;
     private final TextView mLabel;
@@ -45,7 +47,9 @@ class EditorDropdownField {
                 R.layout.payment_request_editor_dropdown, null, false);
 
         mLabel = (TextView) mLayout.findViewById(R.id.spinner_label);
-        mLabel.setText(mFieldModel.getLabel());
+        mLabel.setText(mFieldModel.isRequired()
+                ? mFieldModel.getLabel() + EditorView.REQUIRED_FIELD_INDICATOR
+                : mFieldModel.getLabel());
 
         final List<DropdownKeyValue> dropdownKeyValues = mFieldModel.getDropdownKeyValues();
         for (int j = 0; j < dropdownKeyValues.size(); j++) {
@@ -60,6 +64,7 @@ class EditorDropdownField {
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
 
         mDropdown = (Spinner) mLayout.findViewById(R.id.spinner);
+        mDropdown.setTag(this);
         mDropdown.setContentDescription(mFieldModel.getLabel());
         mDropdown.setAdapter(adapter);
         mDropdown.setSelection(mSelectedIndex);
@@ -94,7 +99,29 @@ class EditorDropdownField {
     }
 
     /** @return The dropdown view itself. */
-    public View getDropdown() {
+    public Spinner getDropdown() {
         return mDropdown;
     }
+
+    @Override
+    public boolean isValid() {
+        return mFieldModel.isValid();
+    }
+
+    @Override
+    public void updateDisplayedError(boolean showError) {
+        View view = mDropdown.getSelectedView();
+        if (view != null && view instanceof TextView) {
+            ((TextView) view).setError(showError ? mFieldModel.getErrorMessage() : null);
+        }
+    }
+
+    @Override
+    public void scrollToAndFocus() {
+        ViewGroup parent = (ViewGroup) mDropdown.getParent();
+        if (parent != null) parent.requestChildFocus(mDropdown, mDropdown);
+        // Open the dropdown to prompt user selection.
+        mDropdown.performClick();
+        mDropdown.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
+    }
 }