use user chosen country code to format and validate phone number for addresses.

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

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.payments.ui;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ skipping 67 matching lines @@
     private final TextView.OnEditorActionListener mEditorActionListener;
     private final int mHalfRowMargin;
     private final int mDropdownTopPadding;
     private final List<EditorFieldView> mFieldViews;
     private final List<EditText> mEditableTextFields;
     private final List<Spinner> mDropdownFields;
     private final InputFilter mCardNumberInputFilter;
     private final TextWatcher mCardNumberFormatter;
 
     @Nullable
-    private TextWatcher mPhoneFormatter;
+    private PhoneNumberUtil.CountryAwareFormatTextWatcher mPhoneFormatter;
     private View mLayout;
     private EditorModel mEditorModel;
     private Button mDoneButton;
     private ViewGroup mDataView;
     private View mFooter;
     @Nullable
     private TextView mCardInput;
     @Nullable
     private TextView mPhoneInput;
 
@@ skipping 49 matching lines @@
                 if (cardNumberPattern.matcher(source.subSequence(start, end)).matches()) {
                     return null;
                 }
 
                 // Reject everything else.
                 return "";
             }
         };
 
         mCardNumberFormatter = new CreditCardNumberFormattingTextWatcher();
-        mPhoneFormatter = new PhoneNumberUtil.FormatTextWatcher();
+        mPhoneFormatter = new PhoneNumberUtil.CountryAwareFormatTextWatcher();
     }
 
     /** Prevents screenshots of this editor. */
     public void disableScreenshots() {
         WindowManager.LayoutParams attributes = getWindow().getAttributes();
         attributes.flags |= WindowManager.LayoutParams.FLAG_SECURE;
         getWindow().setAttributes(attributes);
     }
 
     /** Launches the Autofill help page on top of the current Context. */
@@ skipping 391 matching lines @@
         for (int i = 0; i < mFieldViews.size(); i++) {
             EditorFieldView fieldView = mFieldViews.get(i);
             if (!fieldView.isValid()) {
                 invalidViews.add(fieldView);
                 if (!findAll) break;
             }
         }
         return invalidViews;
     }
 
+    /**
+     * Update the country code used by the phone formatter. This is called when either user
+     * changes country or when editor is initialized with default country.
+     */
+    public void updateCountryOfPhoneFormatter(String country) {

[gogerald1, 2017/06/15 17:41:35]

It looks not an ideal design to let AddressEditor (controller) set data to
EditorDialog (view) directly. It is better to pass data through EditorFieldModel
(model).

Might move mPhoneFormatter to AddressEditor as mPhoneValidator, and
mCardNumberFormatter to CardEditor as well.

[wuandy1, 2017/06/19 15:11:14]

separate cl?

[gogerald1, 2017/06/19 21:30:38]

I would not, this is an important part of your design,

+        mPhoneFormatter.setCountryCode(country);
+    }
+
     /** @return All editable text fields in the editor. Used only for tests. */
     @VisibleForTesting
     public List<EditText> getEditableTextFieldsForTest() {
         return mEditableTextFields;
     }
 
     /** @return All dropdown fields in the editor. Used only for tests. */
     @VisibleForTesting
     public List<Spinner> getDropdownFieldsForTest() {
         return mDropdownFields;
     }
 }