tor-browser

commit 25e00bcbfbc76566578e525c0729ff8b5c5a65dd
parent 3de5ad32f9d818821f9870a035e980c33fdf841b
Author: Matthew Finkel <sysrqb@torproject.org>
Date:   Fri,  4 Sep 2020 14:21:58 +0000

TB 40005: [android] Modify Default toolbar menu

Originally android-components#40005.

Diffstat:
M
mobile/android/android-components/components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt
 | 
42
+++++++++++++++++++++---------------------

1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/mobile/android/android-components/components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt b/mobile/android/android-components/components/browser/menu/src/main/java/mozilla/components/browser/menu/WebExtensionBrowserMenuBuilder.kt
@@ -9,7 +9,6 @@ import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import mozilla.components.browser.menu.item.BackPressMenuItem
 import mozilla.components.browser.menu.item.BrowserMenuDivider
-import mozilla.components.browser.menu.item.BrowserMenuImageText
 import mozilla.components.browser.menu.item.NO_ID
 import mozilla.components.browser.menu.item.ParentBrowserMenuItem
 import mozilla.components.browser.menu.item.WebExtensionBrowserMenuItem
@@ -97,21 +96,19 @@ class WebExtensionBrowserMenuBuilder(
                 iconTintColorResource = style.webExtIconTintColorResource,
             )
 
-            val addonsManagerMenuItem = BrowserMenuImageText(
-                label = context.getString(R.string.mozac_browser_menu_extensions_manager),
-                imageResource = style.addonsManagerMenuItemDrawableRes,
-                iconTintColorResource = style.webExtIconTintColorResource,
-            ) {
-                onAddonsManagerTapped.invoke()
-            }
+//            val addonsManagerMenuItem = BrowserMenuImageText(
+//                label = context.getString(R.string.mozac_browser_menu_extensions_manager),
+//                imageResource = style.addonsManagerMenuItemDrawableRes,
+//                iconTintColorResource = style.webExtIconTintColorResource,
+//            ) {
+//                onAddonsManagerTapped.invoke()
+//            }
 
             val webExtSubMenuItems = if (appendExtensionSubMenuAtStart) {
                 listOf(backPressMenuItem) + BrowserMenuDivider() +
-                    filteredExtensionMenuItems +
-                    BrowserMenuDivider() + addonsManagerMenuItem
+                    filteredExtensionMenuItems
             } else {
-                listOf(addonsManagerMenuItem) + BrowserMenuDivider() +
-                    filteredExtensionMenuItems +
+                filteredExtensionMenuItems +
                     BrowserMenuDivider() + backPressMenuItem
             }
 
@@ -126,25 +123,28 @@ class WebExtensionBrowserMenuBuilder(
                 endOfMenuAlwaysVisible = endOfMenuAlwaysVisible,
             )
         } else {
-            BrowserMenuImageText(
-                label = context.getString(R.string.mozac_browser_menu_extensions),
-                imageResource = style.addonsManagerMenuItemDrawableRes,
-                iconTintColorResource = style.webExtIconTintColorResource,
-            ) {
-                onAddonsManagerTapped.invoke()
-            }
+//            BrowserMenuImageText(
+//                label = context.getString(R.string.mozac_browser_menu_extensions),
+//                imageResource = style.addonsManagerMenuItemDrawableRes,
+//                iconTintColorResource = style.webExtIconTintColorResource,
+//            ) {
+//                onAddonsManagerTapped.invoke()
+//            }
+            null
         }
         val mainMenuIndex = items.indexOfFirst { browserMenuItem ->
             (browserMenuItem as? WebExtensionPlaceholderMenuItem)?.id ==
                 WebExtensionPlaceholderMenuItem.MAIN_EXTENSIONS_MENU_ID
         }
 
-        return if (mainMenuIndex != -1) {
+        return if (mainMenuIndex != -1 && addonsMenuItem != null) {
             items[mainMenuIndex] = addonsMenuItem
             items
             // if we do not have a placeholder we should add the extension submenu at top or bottom
         } else {
-            if (appendExtensionSubMenuAtStart) {
+            if (addonsMenuItem == null) {
+                items
+            } else if (appendExtensionSubMenuAtStart) {
                 listOf(addonsMenuItem) + items
             } else {
                 items + addonsMenuItem