Include selected session in session suggestions if opened from home fragment (#17127)
This commit is contained in:
parent
9873732790
commit
1df656cd0e
|
@ -116,6 +116,7 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
|
|||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("LongMethod")
|
||||
override fun onCreateView(
|
||||
inflater: LayoutInflater,
|
||||
container: ViewGroup?,
|
||||
|
@ -172,10 +173,13 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
|
|||
val awesomeBar = view.awesome_bar
|
||||
awesomeBar.customizeForBottomToolbar = requireContext().settings().shouldUseBottomToolbar
|
||||
|
||||
val fromHomeFragment =
|
||||
findNavController().previousBackStackEntry?.destination?.id == R.id.homeFragment
|
||||
awesomeBarView = AwesomeBarView(
|
||||
activity,
|
||||
interactor,
|
||||
awesomeBar
|
||||
awesomeBar,
|
||||
fromHomeFragment
|
||||
)
|
||||
|
||||
view.awesome_bar.setOnTouchListener { _, _ ->
|
||||
|
@ -191,7 +195,7 @@ class SearchDialogFragment : AppCompatDialogFragment(), UserInteractionHandler {
|
|||
|
||||
requireComponents.core.engine.speculativeCreateSession(isPrivate)
|
||||
|
||||
if (findNavController().previousBackStackEntry?.destination?.id == R.id.homeFragment) {
|
||||
if (fromHomeFragment) {
|
||||
// When displayed above home, dispatches the touch events to scrim area to the HomeFragment
|
||||
view.search_wrapper.background = ColorDrawable(Color.TRANSPARENT)
|
||||
dialog?.window?.decorView?.setOnTouchListener { _, event ->
|
||||
|
|
|
@ -42,7 +42,8 @@ import mozilla.components.browser.search.SearchEngine as LegacySearchEngine
|
|||
class AwesomeBarView(
|
||||
private val activity: HomeActivity,
|
||||
val interactor: AwesomeBarInteractor,
|
||||
val view: BrowserAwesomeBar
|
||||
val view: BrowserAwesomeBar,
|
||||
private val fromHomeFragment: Boolean
|
||||
) {
|
||||
private val sessionProvider: SessionSuggestionProvider
|
||||
private val historyStorageProvider: HistoryStorageSuggestionProvider
|
||||
|
@ -111,7 +112,7 @@ class AwesomeBarView(
|
|||
selectTabUseCase,
|
||||
components.core.icons,
|
||||
getDrawable(activity, R.drawable.ic_search_results_tab),
|
||||
excludeSelectedSession = true
|
||||
excludeSelectedSession = !fromHomeFragment
|
||||
)
|
||||
|
||||
historyStorageProvider =
|
||||
|
|
Loading…
Reference in New Issue
Block a user