Update billing address dropdown style to match the design

BUG=661357

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

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

@@ -5,8 +5,10 @@
 -->
 
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/spinner_item"
     style="?android:attr/spinnerItemStyle"
     android:singleLine="false"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:paddingEnd="24dp"
     android:textAlignment="inherit" />

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

+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content">
+
+	<TextView
+		android:id="@+id/spinner_item"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:paddingStart="24dp"
+		android:paddingEnd="24dp"
+		android:minHeight="48dp"
+		style="?android:attr/spinnerDropDownItemStyle" />
+
+</FrameLayout>
\ No newline at end of file

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

@@ -21,9 +21,11 @@
 
     <android.support.v7.widget.AppCompatSpinner
             android:id="@+id/spinner"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/pref_autofill_field_top_margin" />
+            android:layout_marginTop="@dimen/pref_autofill_field_top_margin"
+            android:padding="0dp"
+            android:dropDownWidth="match_parent" />
 
     <View style="@style/PreferenceSpinnerUnderlineView" />
 

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

@@ -38,6 +38,7 @@ import java.util.List;
  *                                                         ..............
  */
 public class BillingAddressAdapter<T> extends ArrayAdapter<T> {
+    private final int mTextViewResourceId;
 
     /**
      * Creates an array adapter for which the last element is a hint that is not shown in the
@@ -47,18 +48,22 @@ public class BillingAddressAdapter<T> extends ArrayAdapter<T> {
      * @param context            The current context.
      * @param resource           The resource ID for a layout file containing a layout to use when
      *                           instantiating views.
-     * @param objects  The objects to represent in the ListView, the last of which will have a "+"
-     *                 icon on its left and will have a blue tint.
-     * @param hint     The element to be used as a hint when no element is selected. It is not taken
-     *                 into account in the count function and thus will not be displayed when in the
-     *                 expanded dropdown view.
+     * @param textViewResourceId The id of the TextView within the layout resource to be populated.
+     * @param objects            The objects to represent in the ListView, the last of which will
+     *                           have a "+" icon on its left and will have a blue tint.
+     * @param hint               The element to be used as a hint when no element is selected. It is
+     *                           not taken into account in the count function and thus will not be
+     *                           displayed when in the expanded dropdown view.
      */
-    public BillingAddressAdapter(Context context, int resource, List<T> objects, T hint) {
+    public BillingAddressAdapter(
+            Context context, int resource, int textViewResourceId, List<T> objects, T hint) {
         // Make a copy of objects so the hint is not added to the original list.
-        super(context, resource, new ArrayList<T>(objects));
+        super(context, resource, textViewResourceId, new ArrayList<T>(objects));
         // The hint is added as the last element. It will not be shown when the dropdown is
         // expanded and not be taken into account in the getCount function.
         add(hint);
+
+        mTextViewResourceId = textViewResourceId;
     }
 
     @Override
@@ -70,32 +75,58 @@ public class BillingAddressAdapter<T> extends ArrayAdapter<T> {
 
     @Override
     public View getDropDownView(int position, View convertView, ViewGroup parent) {
-        View view;
+        TextView textView = convertView == null
+                ? null
+                : (TextView) convertView.findViewById(mTextViewResourceId);
+        if (textView != null) {
+            // Clear the possible changes for the first and last view.
+            ApiCompatibilityUtils.setPaddingRelative(convertView,
+                    ApiCompatibilityUtils.getPaddingStart(convertView), 0,
+                    ApiCompatibilityUtils.getPaddingEnd(convertView), 0);
+            textView.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
+            ApiCompatibilityUtils.setTextAppearance(
+                    textView, android.R.style.TextAppearance_Widget_DropDownItem);
+        }
+        convertView = super.getDropDownView(position, convertView, parent);
 
+        if (position == 0) {
+            // Padding at the top of the dropdown.
+            ApiCompatibilityUtils.setPaddingRelative(convertView,
+                    ApiCompatibilityUtils.getPaddingStart(convertView),
+                    getContext().getResources().getDimensionPixelSize(
+                            R.dimen.payments_section_small_spacing),
+                    ApiCompatibilityUtils.getPaddingEnd(convertView),
+                    convertView.getPaddingBottom());
+        } else if (position == getCount() - 1) {
             // Add a "+" icon and a blue tint to the last element.
-        if (position == getCount() - 1) {
-            view = super.getDropDownView(position, convertView, parent);
-            TextView tv = (TextView) view;
             Resources resources = getContext().getResources();
+            if (textView == null) {
+                textView = (TextView) convertView.findViewById(mTextViewResourceId);
+            }
 
             // Create the "+" icon, put it left of the text and add appropriate padding.
-            tv.setCompoundDrawablesWithIntrinsicBounds(
+            textView.setCompoundDrawablesWithIntrinsicBounds(
                     TintedDrawable.constructTintedDrawable(
                             resources, R.drawable.plus, R.color.light_active_color),
                     null, null, null);
-            tv.setCompoundDrawablePadding(
+            textView.setCompoundDrawablePadding(
                     resources.getDimensionPixelSize(R.dimen.payments_section_large_spacing));
 
             // Set the correct appearance, face and style for the text.
-            ApiCompatibilityUtils.setTextAppearance(tv, R.style.PaymentsUiSectionAddButtonLabel);
-            tv.setTypeface(Typeface.create(
-                    resources.getString(R.string.roboto_medium_typeface),
+            ApiCompatibilityUtils.setTextAppearance(
+                    textView, R.style.PaymentsUiSectionAddButtonLabel);
+            textView.setTypeface(
+                    Typeface.create(resources.getString(R.string.roboto_medium_typeface),
                             R.integer.roboto_medium_textstyle));
-        } else {
-            // Don't use the recycled convertView, as it may have the style of the last element.
-            view = super.getDropDownView(position, null, parent);
+
+            // Padding at the bottom of the dropdown.
+            ApiCompatibilityUtils.setPaddingRelative(convertView,
+                    ApiCompatibilityUtils.getPaddingStart(convertView), convertView.getPaddingTop(),
+                    ApiCompatibilityUtils.getPaddingEnd(convertView),
+                    getContext().getResources().getDimensionPixelSize(
+                            R.dimen.payments_section_small_spacing));
         }
 
-        return view;
+        return convertView;
     }
 }
\ No newline at end of file

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

@@ -59,9 +59,15 @@ class EditorDropdownField implements EditorFieldView {
         ArrayAdapter<DropdownKeyValue> 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, dropdownKeyValues,
+            adapter = new BillingAddressAdapter<DropdownKeyValue>(context,
+                    R.layout.multiline_spinner_item, R.id.spinner_item, dropdownKeyValues,
                     new DropdownKeyValue("", 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
+            // the dropdown style Spinner and the DropDownListView sets to display TextView instance
+            // in a single line.
+            adapter.setDropDownViewResource(R.layout.payment_request_dropdown_item);
 
             // If no value is selected, select the hint entry which is the last item in the adapter.
             // Using getCount will not result in an out of bounds index because the hint value is
@@ -70,8 +76,8 @@ class EditorDropdownField implements EditorFieldView {
         } else {
             adapter = new ArrayAdapter<DropdownKeyValue>(
                     context, R.layout.multiline_spinner_item, dropdownKeyValues);
-        }
             adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        }
 
         mDropdown = (Spinner) mLayout.findViewById(R.id.spinner);
         mDropdown.setTag(this);