Update layouts for answer and entity suggestions.

- drop redundant properties,
- specify minimum heights, preventing suggestions from shrinking

Bug: 982818
Change-Id: I01d8bdd4e0ab08c0cccf61648e6dee3589aece14
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1919348
Commit-Queue: Ender <ender@google.com>
Reviewed-by: Brandon Wylie <wylieb@chromium.org>
Reviewed-by: Patrick Noland <pnoland@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715985}

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

@@ -4,30 +4,27 @@
     found in the LICENSE file. -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/omnibox_answer"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/omnibox_suggestion_answer_height"
-    android:layout_centerVertical="true"
+    android:layout_height="wrap_content"
     android:orientation="vertical"
+    android:minHeight="@dimen/omnibox_suggestion_height"
     android:paddingVertical="10dp">
 
     <TextView
-        android:ellipsize="end"
         android:id="@+id/omnibox_answer_line_1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:maxLines="1"
-        android:singleLine="true"
+        android:ellipsize="end"
         android:textAlignment="viewStart" />
 
     <TextView
-        android:ellipsize="end"
         android:id="@+id/omnibox_answer_line_2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:maxLines="3"
-        android:singleLine="false"
+        android:ellipsize="end"
         android:textAlignment="viewStart" />
 
 </LinearLayout>

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

@@ -6,24 +6,26 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/omnibox_answer"
     android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical"
+    android:minHeight="@dimen/omnibox_suggestion_height"
     android:paddingVertical="10dp">
 
     <TextView
         android:id="@+id/entity_subject"
-        android:textAppearance="@style/TextAppearance.BlackBodyDefault"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:singleLine="true"
+        android:textAppearance="@style/TextAppearance.BlackBodyDefault"
+        android:maxLines="1"
         android:ellipsize="end"
         android:textAlignment="viewStart" />
 
     <TextView
         android:id="@+id/entity_description"
-        android:textAppearance="@style/TextAppearance.BlackBody"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:singleLine="true"
+        android:textAppearance="@style/TextAppearance.BlackBody"
+        android:maxLines="1"
         android:ellipsize="end"
         android:textAlignment="viewStart" />