Fix AutofillDialogMenuAdapter to support showing multiple lines and icon

chrome/android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogContentView.java

 // Copyright (c) 2013 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.autofill;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import android.content.Context;
+import android.graphics.BitmapFactory;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.animation.Animation;
 import android.view.animation.AnimationSet;
 import android.view.animation.ScaleAnimation;
 import android.view.animation.TranslateAnimation;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.AdapterView.OnItemSelectedListener;
 
 import static org.chromium.chrome.browser.autofill.AutofillDialogConstants.NUM_SECTIONS;
-import static org.chromium.chrome.browser.autofill.AutofillDialogConstants.SECTION_EMAIL;
 import static org.chromium.chrome.browser.autofill.AutofillDialogConstants.SECTION_CC;
 import static org.chromium.chrome.browser.autofill.AutofillDialogConstants.SECTION_CC_BILLING;
 import static org.chromium.chrome.browser.autofill.AutofillDialogConstants.SECTION_BILLING;
 import static org.chromium.chrome.browser.autofill.AutofillDialogConstants.SECTION_SHIPPING;
 
 import org.chromium.chrome.R;
 
 /**
  * This is the parent layout that contains the layouts for different states of
  * autofill dialog. In principle it shouldn't contain any logic related with the
@@ skipping 60 matching lines @@
         }
 
         createAndAddPlaceHolders();
         changeLayoutTo(LAYOUT_FETCHING);
     }
 
     // TODO(yusufo): Remove this method once glue implements fetching data.
     private void createAndAddPlaceHolders() {
         AutofillDialogMenuItem[] ccItems = new AutofillDialogMenuItem[1];
         ccItems[0] = new AutofillDialogMenuItem(
-                0, "XXXX-XXXX-XXXX-1000", "Additional info required", null);
+                0, "XXXX-XXXX-XXXX-1000", "Additional info required",
+                        BitmapFactory.decodeResource(getResources(), R.drawable.visa));
         AutofillDialogMenuItem[] addressItems = new AutofillDialogMenuItem[1];
         addressItems[0] = new AutofillDialogMenuItem(
                 0, "Place Holder", "1600 Amphitheatre Pkwy", null);
         updateMenuItemsForSection(SECTION_CC_BILLING, ccItems);
         updateMenuItemsForSection(SECTION_SHIPPING, addressItems);
     }
 
     @Override
     protected void onMeasure (int widthMeasureSpec, int heightMeasureSpec) {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
@@ skipping 200 matching lines @@
 
         private View initView(int position, View convertView) {
             if (convertView == null) {
                 convertView = View.inflate(getContext(),
                         R.layout.autofill_menu_item, null);
             }
             AutofillDialogMenuItem item = getItem(position);
             ImageView icon = (ImageView) convertView.findViewById(R.id.cc_icon);
             TextView line1 = (TextView) convertView.findViewById(R.id.adapter_item_line_1);
             TextView line2 = (TextView) convertView.findViewById(R.id.adapter_item_line_2);
-            // TODO(yusufo): Fix card icon when it gets added to menuItem.
-            if (icon != null) icon.setImageResource(R.drawable.visa);
+            if (icon != null) {
+                if (item.mIcon != null) {
+                    icon.setImageBitmap(item.mIcon);
+                    icon.setVisibility(VISIBLE);
+                } else {
+                    icon.setImageBitmap(null);
+                    icon.setVisibility(GONE);
+                }
+            }
             if (line1 != null) line1.setText(item.mLine1);
-            if (line2 != null) line2.setText(item.mLine2);
+            if (line2 != null) {
+                if (!TextUtils.isEmpty(item.mLine2)) {
+                    line2.setVisibility(VISIBLE);
+                    line2.setText(item.mLine2);
+                } else {
+                    line2.setVisibility(GONE);
+                }
+            }
             return convertView;
         }
     }
 }