For #4736: Display search shortcuts only from home or search widget
parent
d07d74e8d3
commit
d4c83f9668
|
@ -192,7 +192,7 @@ open class HomeActivity : AppCompatActivity(), ShareFragment.TabsSharedCallback
|
||||||
} else if (intent?.extras?.getBoolean(OPEN_TO_SEARCH) == true) {
|
} else if (intent?.extras?.getBoolean(OPEN_TO_SEARCH) == true) {
|
||||||
this.intent.putExtra(OPEN_TO_SEARCH, false)
|
this.intent.putExtra(OPEN_TO_SEARCH, false)
|
||||||
components.analytics.metrics.track(Event.SearchWidgetNewTabPressed)
|
components.analytics.metrics.track(Event.SearchWidgetNewTabPressed)
|
||||||
navHost.navController.nav(null, NavGraphDirections.actionGlobalSearch(null))
|
navHost.navController.nav(null, NavGraphDirections.actionGlobalSearch(null, true))
|
||||||
return
|
return
|
||||||
} else if (intent?.scheme == "fenix") {
|
} else if (intent?.scheme == "fenix") {
|
||||||
intent.data?.let { handleDeepLink(it) }
|
intent.data?.let { handleDeepLink(it) }
|
||||||
|
|
|
@ -245,7 +245,7 @@ class HomeFragment : Fragment(), AccountObserver {
|
||||||
view.toolbar_wrapper.setOnClickListener {
|
view.toolbar_wrapper.setOnClickListener {
|
||||||
invokePendingDeleteJobs()
|
invokePendingDeleteJobs()
|
||||||
onboarding.finish()
|
onboarding.finish()
|
||||||
val directions = HomeFragmentDirections.actionHomeFragmentToSearchFragment(null)
|
val directions = HomeFragmentDirections.actionHomeFragmentToSearchFragment(null, true)
|
||||||
val extras =
|
val extras =
|
||||||
FragmentNavigator.Extras.Builder()
|
FragmentNavigator.Extras.Builder()
|
||||||
.addSharedElement(toolbar_wrapper, "toolbar_wrapper_transition")
|
.addSharedElement(toolbar_wrapper, "toolbar_wrapper_transition")
|
||||||
|
@ -396,7 +396,7 @@ class HomeFragment : Fragment(), AccountObserver {
|
||||||
}
|
}
|
||||||
is TabAction.Add -> {
|
is TabAction.Add -> {
|
||||||
invokePendingDeleteJobs()
|
invokePendingDeleteJobs()
|
||||||
val directions = HomeFragmentDirections.actionHomeFragmentToSearchFragment(null)
|
val directions = HomeFragmentDirections.actionHomeFragmentToSearchFragment(null, true)
|
||||||
nav(R.id.homeFragment, directions)
|
nav(R.id.homeFragment, directions)
|
||||||
}
|
}
|
||||||
is TabAction.ShareTabs -> {
|
is TabAction.ShareTabs -> {
|
||||||
|
|
|
@ -74,6 +74,10 @@ class SearchFragment : Fragment(), BackHandler {
|
||||||
?.let { it.sessionId }
|
?.let { it.sessionId }
|
||||||
?.let(requireComponents.core.sessionManager::findSessionById)
|
?.let(requireComponents.core.sessionManager::findSessionById)
|
||||||
|
|
||||||
|
val displayShortcutEnginePicker = arguments
|
||||||
|
?.let(SearchFragmentArgs.Companion::fromBundle)
|
||||||
|
?.let { it.showShortcutEnginePicker } ?: false
|
||||||
|
|
||||||
val view = inflater.inflate(R.layout.fragment_search, container, false)
|
val view = inflater.inflate(R.layout.fragment_search, container, false)
|
||||||
val url = session?.url ?: ""
|
val url = session?.url ?: ""
|
||||||
val currentSearchEngine = SearchEngineSource.Default(
|
val currentSearchEngine = SearchEngineSource.Default(
|
||||||
|
@ -84,7 +88,7 @@ class SearchFragment : Fragment(), BackHandler {
|
||||||
SearchStore(
|
SearchStore(
|
||||||
SearchState(
|
SearchState(
|
||||||
query = url,
|
query = url,
|
||||||
showShortcutEnginePicker = true,
|
showShortcutEnginePicker = displayShortcutEnginePicker,
|
||||||
searchEngineSource = currentSearchEngine,
|
searchEngineSource = currentSearchEngine,
|
||||||
defaultEngineSource = currentSearchEngine,
|
defaultEngineSource = currentSearchEngine,
|
||||||
showSuggestions = Settings.getInstance(requireContext()).showSearchSuggestions,
|
showSuggestions = Settings.getInstance(requireContext()).showSearchSuggestions,
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
android:id="@+id/action_global_search"
|
android:id="@+id/action_global_search"
|
||||||
app:destination="@id/searchFragment"
|
app:destination="@id/searchFragment"
|
||||||
app:popUpTo="@id/nav_graph"
|
app:popUpTo="@id/nav_graph"
|
||||||
app:popUpToInclusive="true"/>
|
app:popUpToInclusive="true" />
|
||||||
|
|
||||||
<action
|
<action
|
||||||
android:id="@+id/action_global_crash_reporter"
|
android:id="@+id/action_global_crash_reporter"
|
||||||
|
@ -72,6 +72,10 @@
|
||||||
android:name="session_id"
|
android:name="session_id"
|
||||||
app:argType="string"
|
app:argType="string"
|
||||||
app:nullable="true" />
|
app:nullable="true" />
|
||||||
|
<argument
|
||||||
|
android:name="showShortcutEnginePicker"
|
||||||
|
app:argType="boolean"
|
||||||
|
android:defaultValue="false" />
|
||||||
<action
|
<action
|
||||||
android:id="@+id/action_searchFragment_to_searchEngineFragment"
|
android:id="@+id/action_searchFragment_to_searchEngineFragment"
|
||||||
app:destination="@id/searchEngineFragment"
|
app:destination="@id/searchEngineFragment"
|
||||||
|
|
Loading…
Reference in New Issue