From 78e111fc28aebdf8bf6c19d1fc3e60c3708b855a Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Mon, 24 Aug 2020 11:21:19 -0700
Subject: [PATCH] [fenix] No Issue - Hide keyboard when navigating or scrolling

---
 .../org/mozilla/fenix/searchdialog/SearchDialogController.kt | 1 +
 .../org/mozilla/fenix/searchdialog/SearchDialogFragment.kt   | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/app/src/main/java/org/mozilla/fenix/searchdialog/SearchDialogController.kt b/app/src/main/java/org/mozilla/fenix/searchdialog/SearchDialogController.kt
index 3585efbbfb..a28c81ce50 100644
--- a/app/src/main/java/org/mozilla/fenix/searchdialog/SearchDialogController.kt
+++ b/app/src/main/java/org/mozilla/fenix/searchdialog/SearchDialogController.kt
@@ -159,6 +159,7 @@ class SearchDialogController(
     }
 
     override fun handleClickSearchEngineSettings() {
+        clearToolbarFocus()
         val directions = SearchDialogFragmentDirections.actionGlobalSearchEngineFragment()
         navController.navigateSafe(R.id.searchDialogFragment, directions)
     }
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 b20f9aa181..2b39c43227 100644
--- a/app/src/main/java/org/mozilla/fenix/searchdialog/SearchDialogFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/searchdialog/SearchDialogFragment.kt
@@ -136,6 +136,11 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
             view.awesome_bar
         )
 
+        view.awesome_bar.setOnTouchListener { _, _ ->
+            view.hideKeyboard()
+            false
+        }
+
         return view
     }