Show icons in Android web autofill dropdown

ui/android/java/src/org/chromium/ui/DropdownAdapter.java

 // Copyright 2014 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.ui;
 
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.Typeface;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AbsListView.LayoutParams;
 import android.widget.ArrayAdapter;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import org.chromium.base.ApiCompatibilityUtils;
 
 import java.util.List;
 import java.util.Set;
 
 /**
  * Dropdown item adapter for DropdownPopupWindow.
  */
@@ skipping 29 matching lines @@
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
         View layout = convertView;
         if (convertView == null) {
             LayoutInflater inflater =
                     (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             layout = inflater.inflate(R.layout.dropdown_item, null);
             ApiCompatibilityUtils.setBackgroundForView(layout, new DropdownDividerDrawable());
         }
 
-        DropdownItem item = getItem(position);
-
-        TextView labelView = (TextView) layout.findViewById(R.id.dropdown_label);
-        labelView.setText(item.getLabel());
-
-        labelView.setEnabled(item.isEnabled());
-        if (item.isGroupHeader()) {
-            labelView.setTypeface(null, Typeface.BOLD);
-        } else {
-            labelView.setTypeface(null, Typeface.NORMAL);
-        }
-
         DropdownDividerDrawable divider = (DropdownDividerDrawable) layout.getBackground();
         int height = mContext.getResources().getDimensionPixelSize(R.dimen.dropdown_item_height);
         if (position == 0) {
             divider.setColor(Color.TRANSPARENT);
         } else {
             int dividerHeight = mContext.getResources().getDimensionPixelSize(
                     R.dimen.dropdown_item_divider_height);
             height += dividerHeight;
             divider.setHeight(dividerHeight);
             if (mSeparators != null && mSeparators.contains(position)) {
                 divider.setColor(mContext.getResources().getColor(
                                  R.color.dropdown_dark_divider_color));
             } else {
                 divider.setColor(mContext.getResources().getColor(
                                  R.color.dropdown_divider_color));
             }
         }
         layout.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, height));
 
+        DropdownItem item = getItem(position);
+        TextView labelView = (TextView) layout.findViewById(R.id.dropdown_label);
+        labelView.setText(item.getLabel());
+
+        labelView.setEnabled(item.isEnabled());
+        if (item.isGroupHeader()) {
+            labelView.setTypeface(null, Typeface.BOLD);
+        } else {
+            labelView.setTypeface(null, Typeface.NORMAL);
+        }
+
         TextView sublabelView = (TextView) layout.findViewById(R.id.dropdown_sublabel);
         CharSequence sublabel = item.getSublabel();
         if (TextUtils.isEmpty(sublabel)) {
             sublabelView.setVisibility(View.GONE);
         } else {
             sublabelView.setText(sublabel);
             sublabelView.setVisibility(View.VISIBLE);
         }
 
+        ImageView iconView = (ImageView) layout.findViewById(R.id.dropdown_icon);
+        if (item.getIconId() == DropdownItem.NO_ICON) {
+            iconView.setVisibility(View.GONE);
+        } else {
+            iconView.setImageResource(item.getIconId());
+            iconView.setVisibility(View.VISIBLE);
+        }
+
         return layout;
     }
 
     @Override
     public boolean areAllItemsEnabled() {
         return mAreAllItemsEnabled;
     }
 
     @Override
     public boolean isEnabled(int position) {
         if (position < 0 || position >= getCount()) return false;
         DropdownItem item = getItem(position);
         return item.isEnabled() && !item.isGroupHeader();
     }
 }