From 79180250eae38cdf00d842bff4578c0cfe9e04f1 Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Fri, 11 Sep 2020 11:55:59 -0700
Subject: [PATCH] For #14283 - Fixes overlapping search suggestions and hint

---
 .../fenix/searchdialog/SearchDialogFragment.kt      |  5 +++--
 app/src/main/res/layout/fragment_search_dialog.xml  | 13 ++++++++++---
 app/src/main/res/layout/search_suggestions_hint.xml |  1 +
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/searchdialog/SearchDialogFragment.kt b/app/src/main/java/org/mozilla/fenix/searchdialog/SearchDialogFragment.kt
index b5c7e9a88..695df19f2 100644
--- a/app/src/main/java/org/mozilla/fenix/searchdialog/SearchDialogFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/searchdialog/SearchDialogFragment.kt
@@ -416,11 +416,12 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
                 clear(toolbar.id, TOP)
                 connect(toolbar.id, BOTTOM, PARENT_ID, BOTTOM)
 
-                clear(awesome_bar.id, TOP)
                 clear(pill_wrapper.id, BOTTOM)
-                connect(awesome_bar.id, TOP, PARENT_ID, TOP)
                 connect(pill_wrapper.id, BOTTOM, toolbar.id, TOP)
 
+                clear(search_suggestions_hint.id, TOP)
+                connect(search_suggestions_hint.id, TOP, PARENT_ID, TOP)
+
                 clear(fill_link_from_clipboard.id, TOP)
                 connect(fill_link_from_clipboard.id, BOTTOM, pill_wrapper.id, TOP)
 
diff --git a/app/src/main/res/layout/fragment_search_dialog.xml b/app/src/main/res/layout/fragment_search_dialog.xml
index ddef5fdec..fec3110b8 100644
--- a/app/src/main/res/layout/fragment_search_dialog.xml
+++ b/app/src/main/res/layout/fragment_search_dialog.xml
@@ -42,8 +42,7 @@
         app:layout_constraintBottom_toTopOf="@+id/pill_wrapper"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbar"
-        mozac:awesomeBarChipBackgroundColor="@color/photonGreen50"
+        app:layout_constraintTop_toBottomOf="@id/top_barrier"
         mozac:awesomeBarDescriptionTextColor="?secondaryText"
         mozac:awesomeBarTitleTextColor="?primaryText" />
 
@@ -55,7 +54,15 @@
         android:layout="@layout/search_suggestions_hint"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/toolbar" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/top_barrier"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="bottom"
+        app:constraint_referenced_ids="search_suggestions_hint"/>
+
 
     <View
         android:id="@+id/search_suggestions_hint_divider"
diff --git a/app/src/main/res/layout/search_suggestions_hint.xml b/app/src/main/res/layout/search_suggestions_hint.xml
index d957c2c13..eba0113ef 100644
--- a/app/src/main/res/layout/search_suggestions_hint.xml
+++ b/app/src/main/res/layout/search_suggestions_hint.xml
@@ -6,6 +6,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="?attr/foundation"
     android:paddingTop="20dp"
     android:paddingEnd="20dp"
     android:paddingStart="20dp"