Matthew Finkel pushed to branch tor-browser-82.1.1-10.0-1 at The Tor Project /
Applications / fenix
Commits:
94888f5b by Matthew Finkel at 2020-10-27T22:12:23+00:00
fixup! Bug 40015: Modify Home menu
Bug 40093: Enable Quit menu button
- - - - -
b30df1e9 by Matthew Finkel at 2020-10-27T22:12:49+00:00
fixup! Bug 40016: Modify Default toolbar menu
Bug 40093: Enable Quit menu button
- - - - -
2 changed files:
- app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
- app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
Changes:
=====================================
app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
=====================================
@@ -175,16 +175,13 @@ class DefaultToolbarMenu(
// Predicates that are called once, during screen init
val shouldShowSaveToCollection = (context.asActivity() as?
HomeActivity)
?.browsingModeManager?.mode == BrowsingMode.Normal
- val shouldDeleteDataOnQuit = context.components.settings
- .shouldDeleteBrowsingDataOnQuit &&
- !context.components.settings.shouldDisableNormalMode
val menuItems = listOfNotNull(
downloadsItem,
// historyItem,
bookmarksItem,
settings,
- if (shouldDeleteDataOnQuit) deleteDataOnQuit else null,
+ deleteDataOnQuit,
BrowserMenuDivider(),
findInPage,
addToTopSites,
=====================================
app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
=====================================
@@ -160,12 +160,10 @@ class HomeMenu(
null
}
- val settings = context.components.settings
- val shouldDeleteBrowsingDataOnQuit =
settings.shouldDeleteBrowsingDataOnQuit &&
- !settings.shouldDisableNormalMode
+ // val settings = context.components.settings
val menuItems = listOfNotNull(
- if (shouldDeleteBrowsingDataOnQuit) quitItem else null,
+ quitItem,
settingsItem,
BrowserMenuDivider(),
// if (settings.syncedTabsInTabsTray) null else syncedTabsItem,
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/fenix/-/compare/abfb81fec559269c2b43f5c588aaac7aff9c9cd1...b30df1e9dab97d53260a6008e487387eaf8fbdcb
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/fenix/-/compare/abfb81fec559269c2b43f5c588aaac7aff9c9cd1...b30df1e9dab97d53260a6008e487387eaf8fbdcb
You're receiving this email because of your account on gitlab.torproject.org.
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
