From 2a5f1a8b36741f575a9a6aa7f2d8e2d5422ebca0 Mon Sep 17 00:00:00 2001
From: sarah541 <sarahkhan1107@hotmail.com>
Date: Wed, 6 Mar 2024 01:00:50 -0500
Subject: [PATCH] Bug 1883753 - Remove menu from custom tab bar

---
 .../org/mozilla/fenix/customtabs/CustomTabsIntegration.kt     | 2 ++
 .../mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt    | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt
index ed0c81330e..bcbde9566e 100644
--- a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt
+++ b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt
@@ -27,6 +27,7 @@ class CustomTabsIntegration(
     shouldReverseItems: Boolean,
     isSandboxCustomTab: Boolean,
     isPrivate: Boolean,
+    isNavBarEnabled: Boolean,
 ) : LifecycleAwareFeature, UserInteractionHandler {
 
     init {
@@ -68,6 +69,7 @@ class CustomTabsIntegration(
         closeListener = { activity.finishAndRemoveTask() },
         updateTheme = !isPrivate,
         forceActionButtonTinting = isPrivate,
+        isNavBarEnabled = isNavBarEnabled,
     )
 
     override fun start() = feature.start()
diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt
index 0359581b96..8e8f905a69 100644
--- a/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/customtabs/ExternalAppBrowserFragment.kt
@@ -30,6 +30,7 @@ import org.mozilla.fenix.R
 import org.mozilla.fenix.browser.BaseBrowserFragment
 import org.mozilla.fenix.browser.CustomTabContextMenuCandidate
 import org.mozilla.fenix.browser.FenixSnackbarDelegate
+import org.mozilla.fenix.components.toolbar.IncompleteRedesignToolbarFeature
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.nav
 import org.mozilla.fenix.ext.requireComponents
@@ -59,6 +60,8 @@ class ExternalAppBrowserFragment : BaseBrowserFragment() {
         val manifest =
             args.webAppManifest?.let { json -> WebAppManifestParser().parse(json).getOrNull() }
 
+        val isNavBarEnabled = IncompleteRedesignToolbarFeature(requireContext().settings()).isEnabled
+
         customTabsIntegration.set(
             feature = CustomTabsIntegration(
                 store = requireComponents.core.store,
@@ -70,6 +73,7 @@ class ExternalAppBrowserFragment : BaseBrowserFragment() {
                 isPrivate = tab.content.private,
                 shouldReverseItems = !activity.settings().shouldUseBottomToolbar,
                 isSandboxCustomTab = args.isSandboxCustomTab,
+                isNavBarEnabled = isNavBarEnabled,
             ),
             owner = this,
             view = view,