From 6f962d3376a329d604399e9861cdf3897248e941 Mon Sep 17 00:00:00 2001
From: Yeon Taek Jeong <yeontaekj@gmail.com>
Date: Mon, 5 Aug 2019 15:07:03 -0700
Subject: [PATCH] For #1744: Open search shortcuts when entering search mode
 (#4536)

---
 app/src/main/java/org/mozilla/fenix/HomeActivity.kt        | 2 +-
 .../main/java/org/mozilla/fenix/search/SearchFragment.kt   | 7 +------
 app/src/main/res/navigation/nav_graph.xml                  | 5 -----
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index ec5cfb62a..b9b4c64bd 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -196,7 +196,7 @@ open class HomeActivity : AppCompatActivity(), ShareFragment.TabsSharedCallback
             return
         } else if (intent?.extras?.getBoolean(OPEN_TO_SEARCH) == true) {
             this.intent.putExtra(OPEN_TO_SEARCH, false)
-            navHost.navController.nav(null, NavGraphDirections.actionGlobalSearch(null, true))
+            navHost.navController.nav(null, NavGraphDirections.actionGlobalSearch(null))
             return
         }
 
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 5bf2fccb9..33ac396a9 100644
--- a/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/SearchFragment.kt
@@ -65,11 +65,6 @@ class SearchFragment : Fragment(), BackHandler {
             ?.let { it.sessionId }
             ?.let(requireComponents.core.sessionManager::findSessionById)
 
-        val displaySearchShortcuts = arguments
-            ?.let(SearchFragmentArgs.Companion::fromBundle)
-            ?.let { it.displaySearchShortcuts }
-            ?: false
-
         val view = inflater.inflate(R.layout.fragment_search, container, false)
         val url = session?.url ?: ""
 
@@ -77,7 +72,7 @@ class SearchFragment : Fragment(), BackHandler {
             SearchStore(
                 SearchState(
                     query = url,
-                    showShortcutEnginePicker = displaySearchShortcuts,
+                    showShortcutEnginePicker = true,
                     searchEngineSource = SearchEngineSource.Default(
                         requireComponents.search.searchEngineManager.getDefaultSearchEngine(requireContext())
                     ),
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index a618ea96b..e3dfeeb6b 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -72,11 +72,6 @@
             android:name="session_id"
             app:argType="string"
             app:nullable="true" />
-        <argument
-            android:name="displaySearchShortcuts"
-            android:defaultValue="false"
-            app:argType="boolean"
-            app:nullable="false" />
         <action
             android:id="@+id/action_searchFragment_to_searchEngineFragment"
             app:destination="@id/searchEngineFragment"