PaymentRequest: Fix a bug that retry errors are not consistently shown

This patch includes the following things:
  - Add retry error labels for dropdown fields
  - Move the reset logic from afterTextChanged() to onTextChanged()
    because the afterTextChanged() event happens when setText() is
    called from formatters (e.g. phone number formatter)
  - Re-enable testRetryWithShippingAddressErrors() test

Render Tests:
  PaymentRequestRetryTest#testRetryWithShippingAddressErrors
  PaymentRequestRetryTest#testRetryWithPayerErrors

Manual Tests:
  wpt/payment-request/PaymentValidationErrors/retry-shows-shippingAddress-member-manual.https.html
  wpt/payment-request/PaymentValidationErrors/retry-shows-payer-member-manual.https.html

Bug: 861704, 926252, 942216
Change-Id: I1917e5c6cea05bcb49221c4eee21afa676f50885
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1610258Reviewed-by: David Trainor <dtrainor@chromium.org>
Reviewed-by: Rouslan Solomakhin <rouslan@chromium.org>
Commit-Queue: Jinho Bang <jinho.bang@samsung.com>
Cr-Commit-Position: refs/heads/master@{#660733}

chrome/android/java/res/layout/payment_request_editor.xml

@@ -6,6 +6,7 @@
 <!-- PaymentRequestUI editor dialog. -->
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/editor_container"
     android:background="@color/modern_primary_color">
 
     <!-- Toolbar -->

chrome/android/java/res/layout/payment_request_editor_dropdown.xml

@@ -27,6 +27,14 @@
             android:padding="0dp"
             android:dropDownWidth="match_parent" />
 
-    <View style="@style/PreferenceSpinnerUnderlineView" />
+    <View android:id="@+id/spinner_underline" style="@style/PreferenceSpinnerUnderlineView" />
 
-</LinearLayout>
+    <TextView
\ No newline at end of file
+            android:id="@+id/spinner_error"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/pref_autofill_field_top_margin"
+            android:visibility="gone"
+            android:textAppearance="@style/TextAppearance.ErrorCaption" />
+
+</LinearLayout>

chrome/android/java/src/org/chromium/chrome/browser/widget/prefeditor/EditorDropdownField.java

@@ -21,6 +21,7 @@ import android.widget.ArrayAdapter;
 import android.widget.Spinner;
 import android.widget.TextView;
 
+import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.preferences.autofill.AutofillProfileBridge.DropdownKeyValue;
 import org.chromium.ui.KeyboardVisibilityDelegate;
@@ -37,6 +38,8 @@ class EditorDropdownField implements EditorFieldView {
     private final View mLayout;
     private final TextView mLabel;
     private final Spinner mDropdown;
+    private final View mUnderline;
+    private final TextView mErrorLabel;
     private int mSelectedIndex;
     private ArrayAdapter<CharSequence> mAdapter;
     @Nullable
@@ -66,6 +69,10 @@ class EditorDropdownField implements EditorFieldView {
                         ? mFieldModel.getLabel() + EditorDialog.REQUIRED_FIELD_INDICATOR
                         : mFieldModel.getLabel());
 
+        mUnderline = mLayout.findViewById(R.id.spinner_underline);
+
+        mErrorLabel = mLayout.findViewById(R.id.spinner_error);
+
         final List<DropdownKeyValue> dropdownKeyValues = mFieldModel.getDropdownKeyValues();
         final List<CharSequence> dropdownValues = getDropdownValues(dropdownKeyValues);
         if (mFieldModel.getHint() != null) {
@@ -121,6 +128,8 @@ class EditorDropdownField implements EditorFieldView {
                     }
                     mSelectedIndex = position;
                     mFieldModel.setDropdownKey(key, changedCallback);
+                    mFieldModel.setCustomErrorMessage(null);
+                    updateDisplayedError(false);
                 }
                 if (mObserverForTest != null) {
                     mObserverForTest.onEditorTextUpdate();
@@ -176,8 +185,16 @@ class EditorDropdownField implements EditorFieldView {
                 drawable.setBounds(
                         0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
                 ((TextView) view).setError(mFieldModel.getErrorMessage(), drawable);
+                mUnderline.setBackgroundColor(ApiCompatibilityUtils.getColor(
+                        mContext.getResources(), R.color.error_text_color));
+                mErrorLabel.setText(mFieldModel.getErrorMessage());
+                mErrorLabel.setVisibility(View.VISIBLE);
             } else {
                 ((TextView) view).setError(null);
+                mUnderline.setBackgroundColor(ApiCompatibilityUtils.getColor(
+                        mContext.getResources(), R.color.modern_grey_600));
+                mErrorLabel.setText(null);
+                mErrorLabel.setVisibility(View.GONE);
             }
         }
     }

chrome/android/java/src/org/chromium/chrome/browser/widget/prefeditor/EditorTextField.java

@@ -124,7 +124,6 @@ public class EditorTextField extends FrameLayout implements EditorFieldView, Vie
             @Override
             public void afterTextChanged(Editable s) {
                 fieldModel.setValue(s.toString());
-                fieldModel.setCustomErrorMessage(null);
                 updateDisplayedError(false);
                 updateFieldValueIcon(false);
                 if (mObserverForTest != null) {
@@ -143,7 +142,11 @@ public class EditorTextField extends FrameLayout implements EditorFieldView, Vie
             public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
 
             @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {}
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                if (mInput.hasFocus()) {
+                    fieldModel.setCustomErrorMessage(null);
+                }
+            }
         });
 
         // Display any autofill suggestions.

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestRetryTest.java

@@ -16,7 +16,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.chromium.base.test.util.CommandLineFlags;
-import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeSwitches;
@@ -27,6 +26,7 @@ import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard;
 import org.chromium.chrome.browser.payments.PaymentRequestTestRule.MainActivityStartCallback;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.ui.DisableAnimationsTestRule;
+import org.chromium.chrome.test.util.RenderTestRule;
 import org.chromium.ui.modaldialog.ModalDialogProperties;
 
 import java.util.concurrent.TimeoutException;
@@ -46,6 +46,10 @@ public class PaymentRequestRetryTest implements MainActivityStartCallback {
     public PaymentRequestTestRule mPaymentRequestTestRule =
             new PaymentRequestTestRule("payment_request_retry.html", this);
 
+    @Rule
+    public RenderTestRule mRenderTestRule =
+            new RenderTestRule("components/test/data/payments/render_tests");
+
     @Override
     public void onMainActivityStarted() throws InterruptedException, TimeoutException {
         AutofillTestHelper helper = new AutofillTestHelper();
@@ -111,11 +115,10 @@ public class PaymentRequestRetryTest implements MainActivityStartCallback {
     /**
      * Test for retry() with shipping address errors.
      */
-    @DisabledTest(message = "crbug.com/926252")
     @Test
     @MediumTest
-    @Feature({"Payments"})
-    public void testRetryWithShippingAddressErrors() throws InterruptedException, TimeoutException {
+    @Feature({"Payments", "RenderTest"})
+    public void testRetryWithShippingAddressErrors() throws Throwable {
         mPaymentRequestTestRule.triggerUIAndWait(mPaymentRequestTestRule.getReadyForInput());
         mPaymentRequestTestRule.clickAndWait(
                 R.id.button_primary, mPaymentRequestTestRule.getReadyForUnmaskInput());
@@ -127,14 +130,33 @@ public class PaymentRequestRetryTest implements MainActivityStartCallback {
 
         mPaymentRequestTestRule.retryPaymentRequest("{"
                         + "  shippingAddress: {"
+                        + "    country: 'COUNTRY ERROR',"
+                        + "    recipient: 'RECIPIENT ERROR',"
+                        + "    organization: 'ORGANIZATION ERROR',"
                         + "    addressLine: 'ADDRESS LINE ERROR',"
-                        + "    city: 'CITY ERROR'"
+                        + "    city: 'CITY ERROR',"
+                        + "    region: 'REGION ERROR',"
+                        + "    postalCode: 'POSTAL CODE ERROR',"
+                        + "    phone: 'PHONE ERROR'"
                         + "  }"
                         + "}",
                 mPaymentRequestTestRule.getEditorValidationError());
 
+        mPaymentRequestTestRule.clickInEditorAndWait(
+                R.id.editor_dialog_done_button, mPaymentRequestTestRule.getReadyToEdit());
+
+        mPaymentRequestTestRule.getKeyboardDelegate().hideKeyboard(
+                mPaymentRequestTestRule.getEditorDialogView());
+
+        RenderTestRule.sanitize(mPaymentRequestTestRule.getEditorDialogView());
+        mRenderTestRule.render(mPaymentRequestTestRule.getEditorDialogView(),
+                "retry_with_shipping_address_errors");
+
+        mPaymentRequestTestRule.setSpinnerSelectionInEditorAndWait(
+                0 /* Afghanistan */, mPaymentRequestTestRule.getReadyToEdit());
         mPaymentRequestTestRule.setTextInEditorAndWait(
-                new String[] {"Jane Doe", "Edge Corp.", "111 Wall St.", "New York", "NY"},
+                new String[] {
+                        "Alice", "Supreme Court", "Airport Road", "Kabul", "1043", "020-253-0000"},
                 mPaymentRequestTestRule.getEditorTextUpdate());
         mPaymentRequestTestRule.clickInEditorAndWait(
                 R.id.editor_dialog_done_button, mPaymentRequestTestRule.getReadyToPay());
@@ -145,8 +167,8 @@ public class PaymentRequestRetryTest implements MainActivityStartCallback {
      */
     @Test
     @MediumTest
-    @Feature({"Payments"})
-    public void testRetryWithPayerErrors() throws InterruptedException, TimeoutException {
+    @Feature({"Payments", "RenderTest"})
+    public void testRetryWithPayerErrors() throws Throwable {
         mPaymentRequestTestRule.triggerUIAndWait(mPaymentRequestTestRule.getReadyForInput());
         mPaymentRequestTestRule.clickAndWait(
                 R.id.button_primary, mPaymentRequestTestRule.getReadyForUnmaskInput());
@@ -165,9 +187,19 @@ public class PaymentRequestRetryTest implements MainActivityStartCallback {
                         + "}",
                 mPaymentRequestTestRule.getEditorValidationError());
 
+        mPaymentRequestTestRule.clickInEditorAndWait(
+                R.id.editor_dialog_done_button, mPaymentRequestTestRule.getReadyToEdit());
+
+        mPaymentRequestTestRule.getKeyboardDelegate().hideKeyboard(
+                mPaymentRequestTestRule.getEditorDialogView());
+
+        RenderTestRule.sanitize(mPaymentRequestTestRule.getEditorDialogView());
+        mRenderTestRule.render(
+                mPaymentRequestTestRule.getEditorDialogView(), "retry_with_payer_errors");
+
         mPaymentRequestTestRule.setTextInEditorAndWait(
-                new String[] {"Jane Doe", "650-253-0000", "jon.doe@gmail.com"},
-                mPaymentRequestTestRule.getReadyToEdit());
+                new String[] {"Jane Doe", "650-253-0000", "jane.doe@gmail.com"},
+                mPaymentRequestTestRule.getEditorTextUpdate());
         mPaymentRequestTestRule.clickInEditorAndWait(
                 R.id.editor_dialog_done_button, mPaymentRequestTestRule.getReadyToPay());
     }

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestRule.java

@@ -751,6 +751,7 @@ public class PaymentRequestTestRule extends ChromeTabbedActivityTestRule
         ThreadUtils.runOnUiThreadBlocking(() -> {
             List<EditText> fields = mUI.getEditorDialog().getEditableTextFieldsForTest();
             for (int i = 0; i < values.length; i++) {
+                fields.get(i).requestFocus();
                 fields.get(i).setText(values[i]);
             }
         });
@@ -920,6 +921,11 @@ public class PaymentRequestTestRule extends ChromeTabbedActivityTestRule
                                    .findViewById(R.id.autofill_card_unmask_prompt));
     }
 
+    /* package */ View getEditorDialogView() throws Throwable {
+        return ThreadUtils.runOnUiThreadBlocking(
+                () -> mUI.getEditorDialog().findViewById(R.id.editor_container));
+    }
+
     /** Allows to skip UI into paymenthandler for"basic-card". */
     protected void enableSkipUIForBasicCard() {
         ThreadUtils.runOnUiThreadBlocking(