From db03554fe8f8d39cb4c9cab2dccea25720b79c40 Mon Sep 17 00:00:00 2001
From: ekager <emilykager@gmail.com>
Date: Fri, 31 May 2019 17:08:01 -0700
Subject: [PATCH] [fenix] For
 https://github.com/mozilla-mobile/fenix/issues/2223 , For
 https://github.com/mozilla-mobile/fenix/issues/371 - Replace Toolbar with FIP
 when opened

---
 .../main/java/org/mozilla/fenix/browser/BrowserFragment.kt   | 2 +-
 .../org/mozilla/fenix/components/FindInPageIntegration.kt    | 5 ++++-
 app/src/main/res/layout/fragment_browser.xml                 | 1 -
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
index 3e9bda34c8..516f0a1018 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -265,7 +265,7 @@ class BrowserFragment : Fragment(), BackHandler, CoroutineScope {
 
         findInPageIntegration.set(
             feature = FindInPageIntegration(
-                requireComponents.core.sessionManager, view.findInPageView, view.engineView
+                requireComponents.core.sessionManager, view.findInPageView, view.engineView, toolbar
             ),
             owner = this,
             view = view
diff --git a/app/src/main/java/org/mozilla/fenix/components/FindInPageIntegration.kt b/app/src/main/java/org/mozilla/fenix/components/FindInPageIntegration.kt
index 601874c558..2ab153887f 100644
--- a/app/src/main/java/org/mozilla/fenix/components/FindInPageIntegration.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/FindInPageIntegration.kt
@@ -22,7 +22,8 @@ import org.mozilla.fenix.test.Mockable
 class FindInPageIntegration(
     private val sessionManager: SessionManager,
     private val view: FindInPageView,
-    engineView: EngineView
+    engineView: EngineView,
+    private val toolbar: BrowserToolbar
 ) : LifecycleAwareFeature, BackHandler {
     private val feature = FindInPageFeature(sessionManager, view, engineView, ::onClose)
 
@@ -43,12 +44,14 @@ class FindInPageIntegration(
     }
 
     private fun onClose() {
+        toolbar.visibility = View.VISIBLE
         view.asView().visibility = View.GONE
     }
 
     private fun launch() {
         val session = sessionManager.selectedSession ?: return
 
+        toolbar.visibility = View.GONE
         view.asView().visibility = View.VISIBLE
         feature.bind(session)
     }
diff --git a/app/src/main/res/layout/fragment_browser.xml b/app/src/main/res/layout/fragment_browser.xml
index f1b1a0f91b..419416f2b8 100644
--- a/app/src/main/res/layout/fragment_browser.xml
+++ b/app/src/main/res/layout/fragment_browser.xml
@@ -41,7 +41,6 @@
         android:clickable="true"
         android:visibility="gone"
         app:findInPageNoMatchesTextColor="?attr/destructive"
-        app:layout_behavior="org.mozilla.fenix.components.FindInPageBarBehavior"
         mozac:findInPageButtonsTint="?primaryText"
         mozac:findInPageResultCountTextColor="?primaryText" />