For #4155: Sets pastedText default value
parent
9d30d7bb03
commit
53b3f105ca
|
@ -57,8 +57,7 @@ class DefaultBrowserToolbarController(
|
|||
navController.nav(
|
||||
R.id.browserFragment,
|
||||
BrowserFragmentDirections.actionBrowserFragmentToSearchFragment(
|
||||
sessionId = customTabSession?.id ?: context.components.core.sessionManager.selectedSession?.id,
|
||||
pastedText = text
|
||||
sessionId = customTabSession?.id ?: context.components.core.sessionManager.selectedSession?.id
|
||||
)
|
||||
)
|
||||
}
|
||||
|
@ -75,8 +74,7 @@ class DefaultBrowserToolbarController(
|
|||
navController.nav(
|
||||
R.id.browserFragment,
|
||||
BrowserFragmentDirections.actionBrowserFragmentToSearchFragment(
|
||||
customTabSession?.id ?: context.components.core.sessionManager.selectedSession?.id,
|
||||
pastedText = null
|
||||
customTabSession?.id ?: context.components.core.sessionManager.selectedSession?.id
|
||||
)
|
||||
)
|
||||
}
|
||||
|
@ -120,16 +118,14 @@ class DefaultBrowserToolbarController(
|
|||
}
|
||||
ToolbarMenu.Item.NewTab -> {
|
||||
val directions = BrowserFragmentDirections.actionBrowserFragmentToSearchFragment(
|
||||
sessionId = null,
|
||||
pastedText = null
|
||||
sessionId = null
|
||||
)
|
||||
navController.nav(R.id.browserFragment, directions)
|
||||
browsingModeManager.mode = BrowsingMode.Normal
|
||||
}
|
||||
ToolbarMenu.Item.NewPrivateTab -> {
|
||||
val directions = BrowserFragmentDirections.actionBrowserFragmentToSearchFragment(
|
||||
sessionId = null,
|
||||
pastedText = null
|
||||
sessionId = null
|
||||
)
|
||||
navController.nav(R.id.browserFragment, directions)
|
||||
browsingModeManager.mode = BrowsingMode.Private
|
||||
|
|
|
@ -235,8 +235,7 @@ class HomeFragment : Fragment(), AccountObserver {
|
|||
onboarding.finish()
|
||||
val directions = HomeFragmentDirections.actionHomeFragmentToSearchFragment(
|
||||
sessionId = null,
|
||||
showShortcutEnginePicker = true,
|
||||
pastedText = null
|
||||
showShortcutEnginePicker = true
|
||||
)
|
||||
val extras =
|
||||
FragmentNavigator.Extras.Builder()
|
||||
|
@ -390,8 +389,7 @@ class HomeFragment : Fragment(), AccountObserver {
|
|||
invokePendingDeleteJobs()
|
||||
val directions = HomeFragmentDirections.actionHomeFragmentToSearchFragment(
|
||||
sessionId = null,
|
||||
showShortcutEnginePicker = true,
|
||||
pastedText = null
|
||||
showShortcutEnginePicker = true
|
||||
)
|
||||
nav(R.id.homeFragment, directions)
|
||||
}
|
||||
|
|
|
@ -26,8 +26,7 @@ class StartSearchIntentProcessor(
|
|||
|
||||
val directions = NavGraphDirections.actionGlobalSearch(
|
||||
sessionId = null,
|
||||
showShortcutEnginePicker = true,
|
||||
pastedText = null
|
||||
showShortcutEnginePicker = true
|
||||
)
|
||||
navController.nav(null, directions)
|
||||
true
|
||||
|
|
|
@ -108,6 +108,7 @@
|
|||
app:popUpTo="@+id/searchFragment" />
|
||||
<argument
|
||||
android:name="pastedText"
|
||||
android:defaultValue="@null"
|
||||
app:argType="string"
|
||||
app:nullable="true"/>
|
||||
</fragment>
|
||||
|
|
|
@ -422,7 +422,6 @@
|
|||
<!-- Content Description for session item share button -->
|
||||
<string name="content_description_session_share">Share session</string>
|
||||
|
||||
<string name="paste">Paste</string>
|
||||
<!-- Bookmarks -->
|
||||
<!-- Content description for bookmarks library menu -->
|
||||
<string name="bookmark_menu_content_description">Bookmark menu</string>
|
||||
|
|
|
@ -128,8 +128,7 @@ class DefaultBrowserToolbarControllerTest {
|
|||
navController.nav(
|
||||
R.id.browserFragment,
|
||||
BrowserFragmentDirections.actionBrowserFragmentToSearchFragment(
|
||||
sessionId = "1",
|
||||
pastedText = null
|
||||
sessionId = "1"
|
||||
)
|
||||
)
|
||||
}
|
||||
|
@ -276,7 +275,7 @@ class DefaultBrowserToolbarControllerTest {
|
|||
verify { metrics.track(Event.BrowserMenuItemTapped(Event.BrowserMenuItemTapped.Item.NEW_PRIVATE_TAB)) }
|
||||
verify {
|
||||
val directions = BrowserFragmentDirections
|
||||
.actionBrowserFragmentToSearchFragment(sessionId = null, pastedText = null)
|
||||
.actionBrowserFragmentToSearchFragment(sessionId = null)
|
||||
navController.nav(R.id.browserFragment, directions)
|
||||
}
|
||||
verify { browsingModeManager.mode = BrowsingMode.Private }
|
||||
|
@ -343,7 +342,7 @@ class DefaultBrowserToolbarControllerTest {
|
|||
verify { metrics.track(Event.BrowserMenuItemTapped(Event.BrowserMenuItemTapped.Item.NEW_TAB)) }
|
||||
verify {
|
||||
val directions = BrowserFragmentDirections
|
||||
.actionBrowserFragmentToSearchFragment(sessionId = null, pastedText = null)
|
||||
.actionBrowserFragmentToSearchFragment(sessionId = null)
|
||||
navController.nav(R.id.browserFragment, directions)
|
||||
}
|
||||
verify { browsingModeManager.mode = BrowsingMode.Normal }
|
||||
|
@ -370,7 +369,7 @@ class DefaultBrowserToolbarControllerTest {
|
|||
verify { viewModel.previousFragmentId = R.id.browserFragment }
|
||||
verify {
|
||||
val directions = BrowserFragmentDirections
|
||||
.actionBrowserFragmentToSearchFragment(sessionId = null, pastedText = null)
|
||||
.actionBrowserFragmentToSearchFragment(sessionId = null)
|
||||
navController.nav(R.id.browserFragment, directions)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -67,8 +67,7 @@ class StartSearchIntentProcessorTest {
|
|||
navController.navigate(
|
||||
NavGraphDirections.actionGlobalSearch(
|
||||
sessionId = null,
|
||||
showShortcutEnginePicker = true,
|
||||
pastedText = null
|
||||
showShortcutEnginePicker = true
|
||||
)
|
||||
)
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue