|
|
|
@ -212,6 +212,7 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
|
|
|
|
|
clearToolbar = {
|
|
|
|
|
inlineAutocompleteEditText.setText("")
|
|
|
|
|
},
|
|
|
|
|
dismissDialogAndGoBack = ::dismissDialogAndGoBack,
|
|
|
|
|
),
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
@ -636,24 +637,29 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
|
|
|
|
|
true
|
|
|
|
|
}
|
|
|
|
|
else -> {
|
|
|
|
|
// In case we're displaying search results, we wouldn't have navigated to home, and
|
|
|
|
|
// so we don't need to navigate "back to" browser fragment.
|
|
|
|
|
// See mirror of this logic in BrowserToolbarController#handleToolbarClick.
|
|
|
|
|
if (store.state.searchTerms.isBlank()) {
|
|
|
|
|
val args by navArgs<SearchDialogFragmentArgs>()
|
|
|
|
|
args.sessionId?.let {
|
|
|
|
|
findNavController().navigate(
|
|
|
|
|
SearchDialogFragmentDirections.actionGlobalBrowser(null),
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
view?.hideKeyboard()
|
|
|
|
|
dismissAllowingStateLoss()
|
|
|
|
|
dismissDialogAndGoBack()
|
|
|
|
|
true
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private fun dismissDialogAndGoBack() {
|
|
|
|
|
// In case we're displaying search results, we wouldn't have navigated to home, and
|
|
|
|
|
// so we don't need to navigate "back to" browser fragment.
|
|
|
|
|
// See mirror of this logic in BrowserToolbarController#handleToolbarClick.
|
|
|
|
|
if (store.state.searchTerms.isBlank()) {
|
|
|
|
|
val args by navArgs<SearchDialogFragmentArgs>()
|
|
|
|
|
args.sessionId?.let {
|
|
|
|
|
findNavController().navigate(
|
|
|
|
|
SearchDialogFragmentDirections.actionGlobalBrowser(null),
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
view?.hideKeyboard()
|
|
|
|
|
dismissAllowingStateLoss()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private fun historyStorageProvider(): HistoryStorage? {
|
|
|
|
|
return if (requireContext().settings().shouldShowHistorySuggestions) {
|
|
|
|
|
requireComponents.core.historyStorage
|
|
|
|
|