[WebLayer] Fix bottom controls positioning in shell app

This CL changes the layout of the shell app so the main weblayer
FrameLayout has the correct height. The incorrect height was messing
with the positioning of the bottom bar when scrolling it.

Change-Id: I81808ee10a4c3a46ce25c4e5755c086199da5743
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2402286Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Robbie McElrath <rmcelrath@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805779}

weblayer/shell/android/shell_apk/res/layout/main.xml

@@ -3,28 +3,32 @@
      Use of this source code is governed by a BSD-style license that can be
      found in the LICENSE file. -->
 
-<RelativeLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <ImageButton
-        android:id="@+id/controls_menu_button"
-        android:layout_width="25dp"
-        android:layout_height="25dp"
-        android:scaleType="fitXY"
-        android:paddingLeft="5px"
-        android:paddingRight="5px"
-        android:src="@android:drawable/ic_menu_more"
-        android:background="@android:color/transparent" />
-    <TextView
-        android:id="@+id/version_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toRightOf="@id/controls_menu_button"
-        android:paddingTop="5px" />
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <ImageButton
+            android:id="@+id/controls_menu_button"
+            android:layout_width="25dp"
+            android:layout_height="25dp"
+            android:scaleType="fitXY"
+            android:paddingLeft="5px"
+            android:paddingRight="5px"
+            android:src="@android:drawable/ic_menu_more"
+            android:background="@android:color/transparent" />
+        <TextView
+            android:id="@+id/version_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingTop="5px" />
+    </LinearLayout>
     <FrameLayout
         android:id="@+id/weblayer"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/controls_menu_button" />
-</RelativeLayout>
+        android:layout_height="match_parent" />
+</LinearLayout>