| 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 ed7d2593518ff4b9203443610da01936ef84e992..ea457b1905c2e8a6065fc5987c95168025b8bc78 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
|
| @@ -4,8 +4,10 @@
|
|
|
| package org.chromium.chrome.browser.payments.ui;
|
|
|
| +import android.annotation.SuppressLint;
|
| import android.content.Context;
|
| import android.view.LayoutInflater;
|
| +import android.view.MotionEvent;
|
| import android.view.View;
|
| import android.view.ViewGroup;
|
| import android.view.accessibility.AccessibilityEvent;
|
| @@ -100,6 +102,14 @@ class EditorDropdownField implements EditorFieldView {
|
| @Override
|
| public void onNothingSelected(AdapterView<?> parent) {}
|
| });
|
| + mDropdown.setOnTouchListener(new View.OnTouchListener() {
|
| + @SuppressLint("ClickableViewAccessibility")
|
| + @Override
|
| + public boolean onTouch(View v, MotionEvent event) {
|
| + if (event.getAction() == MotionEvent.ACTION_DOWN) requestFocusAndHideKeyboard();
|
| + return false;
|
| + }
|
| + });
|
| }
|
|
|
| /** @return The View containing everything. */
|
| @@ -138,6 +148,10 @@ class EditorDropdownField implements EditorFieldView {
|
| @Override
|
| public void scrollToAndFocus() {
|
| updateDisplayedError(!isValid());
|
| + requestFocusAndHideKeyboard();
|
| + }
|
| +
|
| + private void requestFocusAndHideKeyboard() {
|
| UiUtils.hideKeyboard(mDropdown);
|
| ViewGroup parent = (ViewGroup) mDropdown.getParent();
|
| if (parent != null) parent.requestChildFocus(mDropdown, mDropdown);
|
|
|