Fix AutofillDialogMenuAdapter to support showing multiple lines and icon

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

Index: chrome/android/java/res/layout/autofill_menu_item.xml
diff --git a/chrome/android/java/res/layout/autofill_menu_item.xml b/chrome/android/java/res/layout/autofill_menu_item.xml
index 89eb467708a86d60c2cffda291d4739c99e99a32..236188bb7eedd1e10b5934887a0a740a86eae2dc 100644
--- a/chrome/android/java/res/layout/autofill_menu_item.xml
+++ b/chrome/android/java/res/layout/autofill_menu_item.xml
@@ -4,27 +4,35 @@
      Use of this source code is governed by a BSD-style license that can be
      found in the LICENSE file.
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/autofill_menu_item"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content" >
+    android:layout_height="@dimen/autofill_menu_item_size"
+    android:minHeight="@dimen/autofill_menu_item_size"
+    android:orientation="horizontal"
+    android:gravity="center_vertical">
     <ImageView
         android:id="@+id/cc_icon"
-        android:layout_width="44dp"
-        android:layout_height="44dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"/>
-    <TextView
-        android:id="@+id/adapter_item_line_1"
-        android:layout_toRightOf="@id/cc_icon"
-        android:layout_width="wrap_content"
+        android:layout_width="@dimen/autofill_menu_item_size"
+        android:layout_height="@dimen/autofill_menu_item_size"
+        android:layout_marginLeft="5dp"/>
+    <LinearLayout
+        android:id="@+id/autofill_menu_text"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textStyle="bold"
-        android:textSize="14sp"/>
-    <TextView
-        android:id="@+id/adapter_item_line_2"
-        android:layout_below="@+id/adapter_item_line_1"
-        android:layout_toRightOf="@id/cc_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="12sp"/>
- </RelativeLayout>
+        android:orientation="vertical">
+        <TextView
+            android:id="@+id/adapter_item_line_1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textStyle="bold"
+            android:textSize="14sp"
+            android:layout_marginLeft="5dp"/>
+        <TextView
+            android:id="@+id/adapter_item_line_2"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="12sp"
+            android:layout_marginLeft="5dp"/>
+    </LinearLayout>
+ </LinearLayout>