Show the image header for the Context Menu

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

Index: chrome/android/java/res/layout/tabular_context_menu_page.xml
diff --git a/chrome/android/java/res/layout/tabular_context_menu_page.xml b/chrome/android/java/res/layout/tabular_context_menu_page.xml
index fcf462960b64322e86f16e82a25fa787d33a4864..e99937f12236926098e8d44f89dd4fc70831e0c4 100644
--- a/chrome/android/java/res/layout/tabular_context_menu_page.xml
+++ b/chrome/android/java/res/layout/tabular_context_menu_page.xml
@@ -2,27 +2,50 @@
 <!-- Copyright 2017 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. -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/content_layer"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:minWidth="280dp"
     android:orientation="vertical">
-    <TextView
-        android:id="@+id/context_header_text"
+    <LinearLayout
+        android:id="@+id/context_header_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
-        android:layout_marginBottom="10dp"
         android:layout_marginStart="20dp"
         android:layout_marginEnd="20dp"
-        android:gravity="center"
-        android:maxLines="1"
-        android:textSize="13sp"
-        android:textStyle="bold"
-        android:ellipsize="end"
-        android:visibility="gone"/>
+        android:layout_marginBottom="10dp"
+        android:layout_gravity="center"
+        android:orientation="vertical"
+        tools:ignore="UseCompoundDrawables">
+        <!-- Cannot use a compound drawable since it does not allow a good change in maxHeight and

[Theresa, 2017/03/28 17:23:08]

Does it allow a hacky change?

[JJ, 2017/03/28 23:19:20]

The hackiest of changes. (You'd have to measure the height subtract the change
in text to figure out the height. Then for a drawable you'd have to
programatically add the drawable in the background. It would end up being a
mess.

I changed it so that it is more definitive (while slightly lying)

+             background to the image. -->
+        <ImageView
+            android:id="@+id/context_header_image"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:contentDescription="@string/context_menu_header_image_default_desc_text"
+            android:foreground="@drawable/tabular_context_menu_image_border"
+            android:minWidth="56dp"
+            android:minHeight="56dp"

[Theresa, 2017/03/28 17:23:08]

Should this be defined in dimens.xml as context_menu_header_image_min_size?

[JJ, 2017/03/28 23:19:20]

Why not.

+            android:maxWidth="@dimen/context_menu_header_image_max_size"
+            android:maxHeight="@dimen/context_menu_header_image_max_size"
+            android:adjustViewBounds="true"
+            android:visibility="gone"/>
+        <TextView
+            android:id="@+id/context_header_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:maxLines="1"
+            android:textSize="13sp"
+            android:textStyle="bold"
+            android:ellipsize="end"
+            android:visibility="gone"/>
+    </LinearLayout>
     <View
         android:id="@+id/context_divider"
         android:layout_width="match_parent"