From 540c1d2ada6bff4db303770d05eab5477b380718 Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Thu, 6 Aug 2020 16:51:58 -0700
Subject: [PATCH] For #13052 - When opening a new tab pre-open search

---
 app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index 9f659f5ca..ad91e0330 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -383,8 +383,10 @@ class HomeFragment : Fragment() {
             }
         }
 
+        val args by navArgs<HomeFragmentArgs>()
+
         if (view.context.settings().accessibilityServicesEnabled &&
-            bundleArgs.getBoolean(FOCUS_ON_ADDRESS_BAR)
+            args.focusOnAddressBar
         ) {
             // We cannot put this in the fragment_home.xml file as it breaks tests
             view.toolbar_wrapper.isFocusableInTouchMode = true
@@ -413,6 +415,10 @@ class HomeFragment : Fragment() {
         }
 
         updateTabCounter(requireComponents.core.store.state)
+
+        if (args.focusOnAddressBar && requireContext().settings().useNewSearchExperience) {
+            navigateToSearch()
+        }
     }
 
     private fun removeAllTabsAndShowSnackbar(sessionCode: String) {