From ef3c3de8a1cd6ec300360a77d78a49c5946df8ac Mon Sep 17 00:00:00 2001
From: mcarare <mihai.carare.dev@gmail.com>
Date: Tue, 19 Nov 2019 16:10:14 +0200
Subject: [PATCH] For #6625 Fix back navigation in search mode from browser

---
 .../main/java/org/mozilla/fenix/search/SearchFragment.kt   | 7 +------
 .../org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt  | 5 ++++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
index 941c9e305..f77317138 100644
--- a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
@@ -226,20 +226,15 @@ class SearchFragment : Fragment(), BackHandler {
     override fun onPause() {
         super.onPause()
         toolbarView.view.clearFocus()
-        // clearing focus makes keyboard hidden after activity is resumed
-        awesomeBarView.isKeyboardDismissedProgrammatically = true
     }
 
     override fun onBackPressed(): Boolean {
         return when {
             qrFeature.onBackPressed() -> {
                 view?.searchScanButton?.isChecked = false
-                // set to true because keyboard is being dismissed when returning from qr scan
-                awesomeBarView.isKeyboardDismissedProgrammatically = true
                 toolbarView.view.requestFocus()
             }
-            !awesomeBarView.isKeyboardDismissedProgrammatically -> true
-            else -> false
+            else -> awesomeBarView.isKeyboardDismissedProgrammatically
         }
     }
 
diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
index 04a5a0e37..3e7a48bcc 100644
--- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
@@ -188,7 +188,10 @@ class AwesomeBarView(
                         view.hideKeyboard()
                         isKeyboardDismissedProgrammatically = true
                     }
-                    RecyclerView.SCROLL_STATE_IDLE -> isKeyboardDismissedProgrammatically = false
+                    RecyclerView.SCROLL_STATE_IDLE -> {
+                        isKeyboardDismissedProgrammatically = false
+                        view.requestFocus()
+                    }
                 }
             }
         }