List incomplete addresses in the billing address dropdown

The billing addresses in the dropdown contain edit required information
and are sorted by completeness.
Select incomplete address brings up address editor.
Select previously selected address or null if user cancels from address editor.
Select and add the newly added or completed address to the top of the dropdown.

BUG=675686

Review-Url: https://codereview.chromium.org/2614193002
Cr-Commit-Position: refs/heads/master@{#442657}

chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillAddress.java

@@ -8,6 +8,7 @@ import android.content.Context;
 import android.support.annotation.IntDef;
 import android.telephony.PhoneNumberUtils;
 import android.text.TextUtils;
+import android.util.Pair;
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.autofill.PersonalDataManager;
@@ -158,10 +159,31 @@ public class AutofillAddress extends PaymentOption {
      * status.
      */
     private void checkAndUpdateAddressCompleteness() {
+        Pair<Integer, Integer> messageResIds =
+                getEditMessageAndTitleResIds(checkAddressCompletionStatus(mProfile));
+
+        mEditMessage = messageResIds.first.intValue() == 0
+                ? null
+                : mContext.getString(messageResIds.first);
+        mEditTitle = messageResIds.second.intValue() == 0
+                ? null
+                : mContext.getString(messageResIds.second);
+        mIsComplete = mEditMessage == null;
+    }
+
+    /**
+     * Gets the edit message and title resource Ids for the completion status.
+     *
+     * @param  completionStatus The completion status.
+     * @return The resource Ids. The first is the edit message resource Id. The second is the
+     *         correspond editor title resource Id.
+     */
+    public static Pair<Integer, Integer> getEditMessageAndTitleResIds(
+            @CompletionStatus int completionStatus) {
         int editMessageResId = 0;
         int editTitleResId = 0;
 
-        switch (checkAddressCompletionStatus(mProfile)) {
+        switch (completionStatus) {
             case COMPLETE:
                 editTitleResId = R.string.autofill_edit_profile;
                 break;
@@ -185,9 +207,7 @@ public class AutofillAddress extends PaymentOption {
                 assert false : "Invalid completion status";
         }
 
-        mEditMessage = editMessageResId == 0 ? null : mContext.getString(editMessageResId);
-        mEditTitle = editTitleResId == 0 ? null : mContext.getString(editTitleResId);
-        mIsComplete = mEditMessage == null;
+        return new Pair<Integer, Integer>(editMessageResId, editTitleResId);
     }
 
     /**

chrome/android/java/src/org/chromium/chrome/browser/payments/AutofillPaymentApp.java

@@ -65,6 +65,8 @@ public class AutofillPaymentApp implements PaymentApp {
                 billingAddress = null;
             }
 
+            if (billingAddress == null) card.setBillingAddressId(null);
+
             String methodName = null;
             if (basicCardSupportedNetworks != null
                     && basicCardSupportedNetworks.contains(card.getBasicCardPaymentType())) {

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

@@ -19,6 +19,7 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.preferences.autofill.AutofillProfileBridge.DropdownKeyValue;
 import org.chromium.ui.UiUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -56,12 +57,13 @@ class EditorDropdownField implements EditorFieldView {
         final List<DropdownKeyValue> dropdownKeyValues = mFieldModel.getDropdownKeyValues();
         mSelectedIndex = getDropdownIndex(dropdownKeyValues, mFieldModel.getValue());
 
-        ArrayAdapter<DropdownKeyValue> adapter;
+        final List<CharSequence> dropdownValues = getDropdownValues(dropdownKeyValues);
+        ArrayAdapter<CharSequence> adapter;
         if (mFieldModel.getHint() != null) {
             // Use the BillingAddressAdapter and pass it a hint to be displayed as default.
-            adapter = new BillingAddressAdapter<DropdownKeyValue>(context,
-                    R.layout.multiline_spinner_item, R.id.spinner_item, dropdownKeyValues,
-                    new DropdownKeyValue("", mFieldModel.getHint().toString()));
+            adapter = new BillingAddressAdapter<CharSequence>(context,
+                    R.layout.multiline_spinner_item, R.id.spinner_item, dropdownValues,
+                    mFieldModel.getHint().toString());
             // Wrap the TextView in the dropdown popup around with a FrameLayout to display the text
             // in multiple lines.
             // Note that the TextView in the dropdown popup is displayed in a DropDownListView for
@@ -74,8 +76,8 @@ class EditorDropdownField implements EditorFieldView {
             // ommited in the count.
             if (mFieldModel.getValue() == null) mSelectedIndex = adapter.getCount();
         } else {
-            adapter = new ArrayAdapter<DropdownKeyValue>(
-                    context, R.layout.multiline_spinner_item, dropdownKeyValues);
+            adapter = new ArrayAdapter<CharSequence>(
+                    context, R.layout.multiline_spinner_item, dropdownValues);
             adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         }
 
@@ -156,6 +158,14 @@ class EditorDropdownField implements EditorFieldView {
         mDropdown.setSelection(mSelectedIndex);
     }
 
+    private static List<CharSequence> getDropdownValues(List<DropdownKeyValue> dropdownKeyValues) {
+        List<CharSequence> dropdownValues = new ArrayList<CharSequence>();
+        for (int i = 0; i < dropdownKeyValues.size(); i++) {
+            dropdownValues.add(dropdownKeyValues.get(i).getValue());
+        }
+        return dropdownValues;
+    }
+
     private static int getDropdownIndex(
             List<DropdownKeyValue> dropdownKeyValues, CharSequence value) {
         for (int i = 0; i < dropdownKeyValues.size(); i++) {

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

@@ -212,12 +212,8 @@ public class EditorFieldModel {
         assert dropdownKeyValues != null;
         EditorFieldModel result = new EditorFieldModel(INPUT_TYPE_HINT_DROPDOWN);
         result.mLabel = label;
-        result.mDropdownKeyValues = dropdownKeyValues;
         result.mHint = hint;
-        result.mDropdownKeys = new HashSet<>();
-        for (int i = 0; i < result.mDropdownKeyValues.size(); i++) {
-            result.mDropdownKeys.add(result.mDropdownKeyValues.get(i).getKey());
-        }
+        result.setDropdownKeyValues(dropdownKeyValues);
         return result;
     }
 
@@ -390,6 +386,11 @@ public class EditorFieldModel {
     public void setDropdownKeyValues(List<DropdownKeyValue> dropdownKeyValues) {
         assert mInputTypeHint == INPUT_TYPE_HINT_DROPDOWN;
         mDropdownKeyValues = dropdownKeyValues;
+        mDropdownKeys = new HashSet<>();
+        for (int i = 0; i < mDropdownKeyValues.size(); i++) {
+            mDropdownKeys.add(mDropdownKeyValues.get(i).getKey());
+        }
+        assert mDropdownKeyValues.size() == mDropdownKeys.size();
     }
 
     /** @return The human-readable label for this field. */

chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillProfileBridge.java

@@ -45,8 +45,8 @@ public class AutofillProfileBridge {
     /**
      * A convenience class for displaying keyed values in a dropdown.
      */
-    public static class DropdownKeyValue extends Pair<String, String> {
-        public DropdownKeyValue(String key, String value) {
+    public static class DropdownKeyValue extends Pair<String, CharSequence> {
+        public DropdownKeyValue(String key, CharSequence value) {
             super(key, value);
         }
 
@@ -56,13 +56,13 @@ public class AutofillProfileBridge {
         }
 
         /** @return The human-readable localized display value. */
-        public String getValue() {
+        public CharSequence getValue() {
             return super.second;
         }
 
         @Override
         public String toString() {
-            return super.second;
+            return super.second.toString();
         }
     }