From d0a45bab21a177b57c14dbee8ec6a57bbd8435be Mon Sep 17 00:00:00 2001 From: mcarare Date: Wed, 17 Mar 2021 19:35:51 +0200 Subject: [PATCH] For #17799: Add extensions submenu item. --- .../mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt | 3 +-- .../fenix/components/toolbar/DefaultToolbarMenu.kt | 10 +++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt index 71d03cbc5..64146d02f 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/ThreeDotMenuMainRobot.kt @@ -411,8 +411,7 @@ private fun assertSettingsButton() = settingsButton() .check(matches(withEffectiveVisibility(Visibility.VISIBLE))) .check(matches(isCompletelyDisplayed())) -private val addOnsText = if (FeatureFlags.toolbarMenuFeature) "Extensions" else "Add-ons" -private fun addOnsButton() = onView(allOf(withText(addOnsText))) +private fun addOnsButton() = onView(allOf(withText("Add-ons"))) private fun assertAddOnsButton() { onView(withId(R.id.mozac_browser_menu_menuView)).perform(swipeDown()) addOnsButton().check(matches(withEffectiveVisibility(Visibility.VISIBLE))) diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt index 38ac495d2..5bc0f4ca3 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt @@ -399,13 +399,9 @@ class DefaultToolbarMenu( onItemTapped.invoke(ToolbarMenu.Item.Downloads) } - val extensionsItem = BrowserMenuImageText( - context.getString(R.string.browser_menu_extensions), - R.drawable.ic_addons_extensions, - primaryTextColor() - ) { - onItemTapped.invoke(ToolbarMenu.Item.AddonsManager) - } + val extensionsItem = WebExtensionPlaceholderMenuItem( + id = WebExtensionPlaceholderMenuItem.MAIN_EXTENSIONS_MENU_ID + ) val syncedTabs = BrowserMenuImageText( label = context.getString(R.string.synced_tabs),