[Payment] should show all accepted card icon in payment editor.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorIconsField.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorIconsField.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorIconsField.java
index afce85711801ab138369dc3ca92f34cbbef2fbb3..6125a46a83b079ecb68cd295fdc3cc4f493b77f8 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorIconsField.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/ui/EditorIconsField.java
@@ -8,13 +8,14 @@ import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewGroup.LayoutParams;
+import android.widget.BaseAdapter;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.widget.DynamicHeightGridView;
+
+import java.util.List;
 
 /**
  * Helper class for creating a horizontal list of icons with a title.
@@ -37,29 +38,54 @@ class EditorIconsField {
 
         ((TextView) mLayout.findViewById(R.id.label)).setText(fieldModel.getLabel());
 
-        LinearLayout container = (LinearLayout) mLayout.findViewById(R.id.icons_container);
-        int size =
-                context.getResources().getDimensionPixelSize(R.dimen.payments_section_logo_width);
-        int margin = context.getResources().getDimensionPixelSize(
-                R.dimen.payments_section_small_spacing);
-        LinearLayout.LayoutParams layoutParams =
-                new LinearLayout.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
-        ApiCompatibilityUtils.setMarginEnd(layoutParams, margin);
-        for (int i = 0; i < fieldModel.getIconResourceIds().size(); i++) {
-            ImageView icon = new ImageView(context);
-            icon.setImageResource(fieldModel.getIconResourceIds().get(i));
-            icon.setBackgroundResource(R.drawable.payments_ui_logo_bg);
-            icon.setContentDescription(context.getString(
-                    fieldModel.getIconDescriptionsForAccessibility().get(i)));
-            icon.setAdjustViewBounds(true);
-            icon.setMaxWidth(size);
-            icon.setMaxHeight(size);
-            container.addView(icon, layoutParams);
-        }
+        DynamicHeightGridView container =

[gogerald1, 2017/05/24 14:25:23]

nit: iconsContainer

[Hwanseung Lee, 2017/05/26 15:42:39]

Done.

+                (DynamicHeightGridView) mLayout.findViewById(R.id.icons_container);
+        container.setAdapter(new IconAdapter(context, fieldModel.getIconResourceIds(),
+                fieldModel.getIconDescriptionsForAccessibility()));
     }
 
     /** @return The View containing everything. */
     public View getLayout() {
         return mLayout;
     }
+
+    private static class IconAdapter extends BaseAdapter {

[gogerald1, 2017/05/24 14:25:23]

gridview setAdapter accepts ListAdapter

https://developer.android.com/reference/android/widget/GridView.html#setAdapt...

[Hwanseung Lee, 2017/05/26 15:42:39]

right, but BaseAdapter implement ListAdapter.
https://developer.android.com/reference/android/widget/BaseAdapter.html

+        private Context mContext;
+        private List<Integer> mIconResources;

[gogerald1, 2017/05/24 14:25:23]

nit: mIconResourceIds

[Hwanseung Lee, 2017/05/26 15:42:39]

Done.

+        private List<Integer> mIconDescription;

[gogerald1, 2017/05/24 14:25:23]

nit: mIconDescriptionIds

[Hwanseung Lee, 2017/05/26 15:42:39]

Done.

+        private int mIconSize;
+
+        public IconAdapter(

[gogerald1, 2017/05/24 14:25:23]

IconListAdapter?

[Hwanseung Lee, 2017/05/26 15:42:39]

Done.

+                Context context, List<Integer> iconResources, List<Integer> iconDescription) {
+            mContext = context;
+            mIconResources = iconResources;
+            mIconDescription = iconDescription;
+            mIconSize = mContext.getResources().getDimensionPixelSize(
+                    R.dimen.payments_section_logo_width);

[gogerald1, 2017/05/24 14:25:23]

nit: assert mIconResourceIds.size() == mIconDescriptionIds.size();

[Hwanseung Lee, 2017/05/26 15:42:39]

Done.

+        }
+        public int getCount() {

[gogerald1, 2017/05/24 14:25:23]

one space line above and @Override

[Hwanseung Lee, 2017/05/26 15:42:40]

Done.

+            return mIconResources.size();
+        }
+        public Object getItem(int position) {

[gogerald1, 2017/05/24 14:25:23]

ditto

[Hwanseung Lee, 2017/05/26 15:42:39]

Done.

+            return mIconResources.get(position);
+        }
+        public long getItemId(int position) {

[gogerald1, 2017/05/24 14:25:23]

ditto

[Hwanseung Lee, 2017/05/26 15:42:39]

Done.

+            return position;
+        }
+        public View getView(int position, View convertView, ViewGroup parent) {

[gogerald1, 2017/05/24 14:25:23]

ditto

[Hwanseung Lee, 2017/05/26 15:42:39]

Done.

+            ImageView imageView;

[gogerald1, 2017/05/24 14:25:23]

you can simplify this code like below.

ImageView iconView = covertView;
if(iconView == null) iconView = new ImageView(mContext);

[Hwanseung Lee, 2017/05/26 15:42:39]

Done.

+            if (convertView == null) {
+                imageView = new ImageView(mContext);
+            } else {
+                imageView = (ImageView) convertView;
+            }
+            imageView.setImageResource(mIconResources.get(position));

[gogerald1, 2017/05/24 14:25:23]

setImageDrawable instead of setImageResource,
https://cs.chromium.org/chromium/src/chrome/android/java/src/org/chromium/chr...

[Hwanseung Lee, 2017/05/26 15:42:39]

Done.

+            imageView.setBackgroundResource(R.drawable.payments_ui_logo_bg);

[gogerald1, 2017/05/24 14:25:23]

no need setBackgroundResource anymore,

[Hwanseung Lee, 2017/05/26 15:42:39]

Done.

+            imageView.setContentDescription(mContext.getString(mIconDescription.get(position)));
+            imageView.setAdjustViewBounds(true);
+            imageView.setMaxWidth(mIconSize);
+            imageView.setMaxHeight(mIconSize);
+            return imageView;
+        }
+    }
 }