From 19d1360e7d6e3ab586fb3f26419be8dbb38d5e59 Mon Sep 17 00:00:00 2001
From: Craig Russell <craig.russell.1986@gmail.com>
Date: Thu, 22 Feb 2018 12:03:13 +0000
Subject: [PATCH 1/2] Fix landscape layout's squished controls; add scroll view
 to menu items

---
 .../res/layout/popup_window_browser_menu.xml  | 77 +++++++++++--------
 1 file changed, 43 insertions(+), 34 deletions(-)

diff --git a/app/src/main/res/layout/popup_window_browser_menu.xml b/app/src/main/res/layout/popup_window_browser_menu.xml
index 7f5921ef064f..ac254ecafe0a 100644
--- a/app/src/main/res/layout/popup_window_browser_menu.xml
+++ b/app/src/main/res/layout/popup_window_browser_menu.xml
@@ -16,14 +16,16 @@
 
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/white">
 
     <LinearLayout
         android:id="@+id/header"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="50dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
         android:background="@color/white"
         android:gravity="center"
         android:orientation="horizontal">
@@ -63,38 +65,45 @@
         android:background="@color/white_two"
         app:layout_constraintBottom_toBottomOf="@+id/header" />
 
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingBottom="20dp"
-        android:paddingTop="13dp"
-        app:layout_constraintTop_toBottomOf="@id/header">
-
-        <TextView
-            android:id="@+id/bookmarksPopupMenuItem"
-            style="@style/BrowserTextMenuItem"
-            android:enabled="false"
-            android:text="@string/bookmarksMenuTitle" />
-
-        <TextView
-            android:id="@+id/addBookmarksPopupMenuItem"
-            style="@style/BrowserTextMenuItem"
-            android:enabled="false"
-            android:text="@string/addBookmarkMenuTitle" />
-
-        <TextView
-            android:id="@+id/findInPageMenuItem"
-            style="@style/BrowserTextMenuItem"
-            android:enabled="false"
-            android:text="@string/find_in_page" />
-
-        <TextView
-            android:id="@+id/settingsPopupMenuItem"
-            style="@style/BrowserTextMenuItem"
-            android:enabled="false"
-            android:text="@string/settingsMenuItemTitle" />
+    <ScrollView
+        android:layout_width="match_parent"
+        app:layout_constraintTop_toBottomOf="@id/header"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingBottom="20dp"
+            android:paddingTop="13dp">
+
+            <TextView
+                android:id="@+id/bookmarksPopupMenuItem"
+                style="@style/BrowserTextMenuItem"
+                android:enabled="false"
+                android:text="@string/bookmarksMenuTitle" />
+
+            <TextView
+                android:id="@+id/addBookmarksPopupMenuItem"
+                style="@style/BrowserTextMenuItem"
+                android:enabled="false"
+                android:text="@string/addBookmarkMenuTitle" />
+
+            <TextView
+                android:id="@+id/findInPageMenuItem"
+                style="@style/BrowserTextMenuItem"
+                android:enabled="false"
+                android:text="@string/find_in_page" />
+
+            <TextView
+                android:id="@+id/settingsPopupMenuItem"
+                style="@style/BrowserTextMenuItem"
+                android:enabled="false"
+                android:text="@string/settingsMenuItemTitle" />
+
+        </LinearLayout>
+
+    </ScrollView>
 
-    </LinearLayout>
 
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file

From ac1b1d1518f623655508d11ada26b271782dcb0c Mon Sep 17 00:00:00 2001
From: Craig Russell <craig.russell.1986@gmail.com>
Date: Thu, 22 Feb 2018 12:14:40 +0000
Subject: [PATCH 2/2] Formatting only

---
 app/src/main/res/layout/popup_window_browser_menu.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/popup_window_browser_menu.xml b/app/src/main/res/layout/popup_window_browser_menu.xml
index ac254ecafe0a..a71d7c7f17c9 100644
--- a/app/src/main/res/layout/popup_window_browser_menu.xml
+++ b/app/src/main/res/layout/popup_window_browser_menu.xml
@@ -24,11 +24,11 @@
         android:id="@+id/header"
         android:layout_width="0dp"
         android:layout_height="50dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
         android:background="@color/white"
         android:gravity="center"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
 
         <ImageButton
             android:id="@+id/backPopupMenuItem"
@@ -67,8 +67,8 @@
 
     <ScrollView
         android:layout_width="match_parent"
-        app:layout_constraintTop_toBottomOf="@id/header"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toBottomOf="@id/header">
 
         <LinearLayout
             android:layout_width="wrap_content"