Don't show keyboard when editing a server card.

BUG=657621

Review-Url: https://chromiumcodereview.appspot.com/2432833003
Cr-Commit-Position: refs/heads/master@{#426561}

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

@@ -17,6 +17,7 @@ import android.widget.TextView;
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.preferences.autofill.AutofillProfileBridge.DropdownKeyValue;
+import org.chromium.ui.UiUtils;
 
 import java.util.List;
 
@@ -114,6 +115,8 @@ class EditorDropdownField implements EditorFieldView {
 
     @Override
     public void scrollToAndFocus() {
+        updateDisplayedError(!isValid());
+        UiUtils.hideKeyboard(mDropdown);
         ViewGroup parent = (ViewGroup) mDropdown.getParent();
         if (parent != null) parent.requestChildFocus(mDropdown, mDropdown);
         mDropdown.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);

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

@@ -21,7 +21,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.CheckBox;
@@ -429,21 +428,6 @@ public class EditorView extends AlwaysDismissedDialog
                 }
             });
         }
-
-        // If some of the required fields are valid, then this EditorView is for modification, so
-        // validate form to update displayed errors and hide keyboard by default.
-        if (hasValidRequiredField()) {
-            getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
-            mHandler.post(new Runnable() {
-                @Override
-                public void run() {
-                    validateForm();
-                }
-            });
-        } else {
-            getWindow().setSoftInputMode(
-                    WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
-        }
     }
 
     /** Rereads the values in the model to update the UI. */
@@ -472,15 +456,6 @@ public class EditorView extends AlwaysDismissedDialog
         }
     }
 
-    private boolean hasValidRequiredField() {
-        List<EditorFieldModel> fields = mEditorModel.getFields();
-        for (int i = 0; i < fields.size(); i++) {
-            EditorFieldModel field = fields.get(i);
-            if (field.isRequired() && field.isValid()) return true;
-        }
-        return false;
-    }
-
     private List<EditorFieldView> getViewsWithInvalidInformation(boolean findAll) {
         List<EditorFieldView> invalidViews = new ArrayList<>();
         for (int i = 0; i < mFieldViews.size(); i++) {