fixup! TB 44581 [android]: Cleanup new android compose tab-strip feature (a2ca3e21) · Commits · The Tor Project / Applications / Tor Browser

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/menu/compose/MainMenu.kt

+28 −0

Original line number	Diff line number	Diff line
		@@ -264,6 +264,22 @@ fun MainMenu(
		}
		}

		if (accessPoint == MenuAccessPoint.Home) {
		MenuGroup {
		ExtensionsMenuItem(
		inCustomTab = false,
		isPrivate = isPrivate,
		isExtensionsProcessDisabled = isExtensionsProcessDisabled,
		isExtensionsExpanded = isExtensionsExpanded,
		isAllWebExtensionsDisabled = isAllWebExtensionsDisabled,
		webExtensionMenuCount = webExtensionMenuCount,
		extensionsMenuItemDescription = extensionsMenuItemDescription,
		onExtensionsMenuClick = onExtensionsMenuClick,
		extensionSubmenu = extensionSubmenu,
		)
		}
		}

		if (accessPoint == MenuAccessPoint.Browser) {
		ToolsAndActionsMenuGroup(
		isBookmarked = isBookmarked,
		@@ -407,6 +423,18 @@ private fun ToolsAndActionsMenuGroup(
		)
		}

		ExtensionsMenuItem(
		inCustomTab = false,
		isPrivate = isPrivate,
		isExtensionsProcessDisabled = isExtensionsProcessDisabled,
		isExtensionsExpanded = isExtensionsExpanded,
		isAllWebExtensionsDisabled = isAllWebExtensionsDisabled,
		webExtensionMenuCount = webExtensionMenuCount,
		extensionsMenuItemDescription = extensionsMenuItemDescription,
		onExtensionsMenuClick = onExtensionsMenuClick,
		extensionSubmenu = extensionSubmenu,
		)

		if (!moreMenuExpanded) {
		MoreMenuButtonGroup(
		isMoreMenuHighlighted = false, // This prevents a dot from incorrectly showing e.g. "open in app" is available, even though we disable it.