Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
The Tor Project
Applications
fenix
Commits
03b642ac
Unverified
Commit
03b642ac
authored
Oct 21, 2020
by
Matthew Finkel
Browse files
Merge remote-tracking branch 'acatgl/40094' into tor-browser-82.0.0b4-10.0-1
parents
67007f53
7edfd5b5
Pipeline
#1428
failed with stages
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
View file @
03b642ac
...
...
@@ -87,9 +87,7 @@ import org.mozilla.fenix.components.PrivateShortcutCreateManager
import
org.mozilla.fenix.components.StoreProvider
import
org.mozilla.fenix.components.TabCollectionStorage
import
org.mozilla.fenix.components.metrics.Event
import
org.mozilla.fenix.components.tips.FenixTipManager
import
org.mozilla.fenix.components.tips.Tip
import
org.mozilla.fenix.components.tips.providers.MasterPasswordTipProvider
import
org.mozilla.fenix.components.toolbar.TabCounterMenu
import
org.mozilla.fenix.components.toolbar.ToolbarPosition
import
org.mozilla.fenix.ext.components
...
...
@@ -218,17 +216,6 @@ class HomeFragment : Fragment() {
expandedCollections
=
emptySet
(),
mode
=
currentMode
.
getCurrentMode
(),
topSites
=
components
.
core
.
topSitesStorage
.
cachedTopSites
,
tip
=
StrictMode
.
allowThreadDiskReads
().
resetPoliciesAfter
{
FenixTipManager
(
listOf
(
MasterPasswordTipProvider
(
requireContext
(),
::
navToSavedLogins
,
::
dismissTip
)
)
).
getTip
()
},
showCollectionPlaceholder
=
components
.
settings
.
showCollectionsPlaceholderOnHome
)
)
...
...
@@ -685,17 +672,6 @@ class HomeFragment : Fragment() {
collections
=
components
.
core
.
tabCollectionStorage
.
cachedTabCollections
,
mode
=
currentMode
.
getCurrentMode
(),
topSites
=
components
.
core
.
topSitesStorage
.
cachedTopSites
,
tip
=
StrictMode
.
allowThreadDiskReads
().
resetPoliciesAfter
{
FenixTipManager
(
listOf
(
MasterPasswordTipProvider
(
requireContext
(),
::
navToSavedLogins
,
::
dismissTip
)
)
).
getTip
()
},
showCollectionPlaceholder
=
components
.
settings
.
showCollectionsPlaceholderOnHome
)
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment