GitLab is used only for code review, issue tracking and project management. Canonical locations for source code are still https://gitweb.torproject.org/ https://git.torproject.org/ and git-rw.torproject.org.

Commit d3dfa93f authored by Matthew Finkel's avatar Matthew Finkel

Bug 40015: Modify Home menu

parent 8a49393c
......@@ -19,7 +19,7 @@ object FeatureFlags {
*
* Tracking issue: https://github.com/mozilla-mobile/fenix/issues/13892
*/
val syncedTabsInTabsTray = Config.channel.isNightlyOrDebug
const val syncedTabsInTabsTray = false
/**
* Shows the grid view settings for the tabs tray.
......@@ -34,7 +34,7 @@ object FeatureFlags {
/**
* Enables downloads with external download managers.
*/
const val externalDownloadManager = true
const val externalDownloadManager = false
/**
* Enables swipe to delete in bookmarks
......
......@@ -104,21 +104,21 @@ class HomeMenu(
onItemTapped.invoke(Item.Bookmarks)
}
val historyItem = BrowserMenuImageText(
context.getString(R.string.library_history),
R.drawable.ic_history,
primaryTextColor
) {
onItemTapped.invoke(Item.History)
}
val addons = BrowserMenuImageText(
context.getString(R.string.browser_menu_add_ons),
R.drawable.ic_addons_extensions,
primaryTextColor
) {
onItemTapped.invoke(Item.AddonsManager)
}
// val historyItem = BrowserMenuImageText(
// context.getString(R.string.library_history),
// R.drawable.ic_history,
// primaryTextColor
// ) {
// onItemTapped.invoke(Item.History)
// }
// val addons = BrowserMenuImageText(
// context.getString(R.string.browser_menu_add_ons),
// R.drawable.ic_addons_extensions,
// primaryTextColor
// ) {
// onItemTapped.invoke(Item.AddonsManager)
// }
val settingsItem = BrowserMenuImageText(
context.getString(R.string.browser_menu_settings),
......@@ -128,13 +128,13 @@ class HomeMenu(
onItemTapped.invoke(Item.Settings)
}
val syncedTabsItem = BrowserMenuImageText(
context.getString(R.string.library_synced_tabs),
R.drawable.ic_synced_tabs,
primaryTextColor
) {
onItemTapped.invoke(Item.SyncedTabs)
}
// val syncedTabsItem = BrowserMenuImageText(
// context.getString(R.string.library_synced_tabs),
// R.drawable.ic_synced_tabs,
// primaryTextColor
// ) {
// onItemTapped.invoke(Item.SyncedTabs)
// }
val helpItem = BrowserMenuImageText(
context.getString(R.string.browser_menu_help),
......@@ -160,20 +160,18 @@ 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,
// if (settings.syncedTabsInTabsTray) null else syncedTabsItem,
bookmarksItem,
historyItem,
// historyItem,
downloadsItem,
BrowserMenuDivider(),
addons,
// addons,
BrowserMenuDivider(),
whatsNewItem,
helpItem,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment