Bug 1971553 - Remove leftover toolbar redesign layout code. r=android-reviewers,petru

Differential Revision: https://phabricator.services.mozilla.com/D253358

Author: rocketsroger

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt

@@ -337,7 +337,6 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
     @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
     internal fun addLeadingAction(
         context: Context,
-        showHomeButton: Boolean,
         showEraseButton: Boolean,
     ) {
         if (leadingAction != null) return
@@ -352,7 +351,7 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
                 iconTintColorResource = ThemeManager.resolveAttribute(R.attr.textPrimary, context),
                 listener = browserToolbarInteractor::onEraseButtonClicked,
             )
-        } else if (showHomeButton) {
+        } else {
             BrowserToolbar.Button(
                 imageDrawable = AppCompatResources.getDrawable(
                     context,
@@ -362,23 +361,13 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
                 iconTintColorResource = ThemeManager.resolveAttribute(R.attr.textPrimary, context),
                 listener = browserToolbarInteractor::onHomeButtonClicked,
             )
-        } else {
-            null
         }
 
         leadingAction?.let {
             (_browserToolbarView as? BrowserToolbarView)?.toolbar?.addNavigationAction(it)
         }
     }
 
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-    internal fun removeLeadingAction() {
-        leadingAction?.let {
-            (_browserToolbarView as? BrowserToolbarView)?.toolbar?.removeNavigationAction(it)
-        }
-        leadingAction = null
-    }
-
     /**
      * This code takes care of the [BrowserToolbar] leading and navigation actions.
      * The older design requires a HomeButton followed by navigation buttons for tablets.
@@ -394,7 +383,6 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
         feltPrivateBrowsingEnabled: Boolean,
     ) {
         updateAddressBarLeadingAction(
-            redesignEnabled = false,
             isLandscape = isLandscape,
             isPrivate = isPrivate,
             isTablet = isTablet,
@@ -407,37 +395,18 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
 
     @VisibleForTesting
     internal fun updateAddressBarLeadingAction(
-        redesignEnabled: Boolean,
         isLandscape: Boolean,
         isTablet: Boolean,
         isPrivate: Boolean,
         feltPrivateBrowsingEnabled: Boolean,
         context: Context,
     ) {
-        val showHomeButton = !redesignEnabled
         val showEraseButton = feltPrivateBrowsingEnabled && isPrivate && (isLandscape || isTablet)
 
-        if (showHomeButton || showEraseButton) {
-            addLeadingAction(
-                context = context,
-                showHomeButton = showHomeButton,
-                showEraseButton = showEraseButton,
-            )
-        } else {
-            removeLeadingAction()
-        }
-    }
-
-    @VisibleForTesting
-    internal fun updateAddressBarNavigationActions(
-        context: Context,
-        isWindowSizeSmall: Boolean,
-    ) {
-        if (!isWindowSizeSmall) {
-            addNavigationActions(context)
-        } else {
-            removeNavigationActions()
-        }
+        addLeadingAction(
+            context = context,
+            showEraseButton = showEraseButton,
+        )
     }
 
     override fun onUpdateToolbarForConfigurationChange(toolbar: FenixBrowserToolbarView) {

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabsIntegration.kt

@@ -147,19 +147,6 @@ class CustomTabsIntegration(
 
     override fun onBackPressed() = feature.onBackPressed()
 
-    @VisibleForTesting
-    internal fun updateAddressBarNavigationActions(
-        context: Context,
-        isWindowSizeSmall: Boolean,
-    ) {
-        if (!isWindowSizeSmall) {
-            addNavigationActions(context)
-            browserToolbar.invalidateActions()
-        } else {
-            removeNavigationActions()
-        }
-    }
-
     @VisibleForTesting
     internal fun addNavigationActions(context: Context) {
         val enableTint = feature.iconColor

mobile/android/fenix/app/src/test/java/org/mozilla/fenix/browser/BrowserFragmentTest.kt

@@ -500,7 +500,7 @@ class BrowserFragmentTest {
             feltPrivateBrowsingEnabled = false,
         )
 
-        verify(exactly = 1) { browserFragment.addLeadingAction(any(), any(), any()) }
+        verify(exactly = 1) { browserFragment.addLeadingAction(any(), any()) }
         verify(exactly = 0) { browserFragment.addTabletActions(any()) }
         verify(exactly = 0) { browserFragment.addNavigationActions(any()) }
 
@@ -520,7 +520,7 @@ class BrowserFragmentTest {
             feltPrivateBrowsingEnabled = false,
         )
 
-        verify(exactly = 1) { browserFragment.addLeadingAction(any(), any(), any()) }
+        verify(exactly = 1) { browserFragment.addLeadingAction(any(), any()) }
         verify(exactly = 0) { browserFragment.addTabletActions(any()) }
         verify(exactly = 0) { browserFragment.addNavigationActions(any()) }
 
@@ -542,7 +542,7 @@ class BrowserFragmentTest {
         )
 
         verifyOrder {
-            browserFragment.addLeadingAction(any(), any(), any())
+            browserFragment.addLeadingAction(any(), any())
             browserFragment.addNavigationActions(any())
         }
 
@@ -564,7 +564,6 @@ class BrowserFragmentTest {
             feltPrivateBrowsingEnabled = false,
         )
 
-        verify(exactly = 0) { browserFragment.removeLeadingAction() }
         verify(exactly = 0) { browserFragment.removeNavigationActions() }
 
         unmockThemeManagerAndAppCompatResources()
@@ -585,7 +584,7 @@ class BrowserFragmentTest {
             feltPrivateBrowsingEnabled = false,
         )
 
-        verify(exactly = 1) { browserFragment.addLeadingAction(any(), any(), any()) }
+        verify(exactly = 1) { browserFragment.addLeadingAction(any(), any()) }
         verify(exactly = 1) { browserFragment.addNavigationActions(any()) }
 
         unmockThemeManagerAndAppCompatResources()

mobile/android/fenix/app/src/test/java/org/mozilla/fenix/customtabs/CustomTabsIntegrationTest.kt

@@ -164,56 +164,6 @@ class CustomTabsIntegrationTest {
         verify(exactly = 2) { toolbar.removeNavigationAction(any()) }
     }
 
-    @Test
-    fun `GIVEN isLandscape is true WHEN updateAddressBarNavigationActions is called THEN navigation buttons are added`() {
-        val toolbar: BrowserToolbar = mockk(relaxed = true)
-        val integration = spyk(getIntegration(toolbar))
-
-        assertNull(integration.forwardAction)
-        assertNull(integration.backAction)
-
-        integration.updateAddressBarNavigationActions(testContext, isWindowSizeSmall = false)
-
-        assertNotNull(integration.forwardAction)
-        assertNotNull(integration.backAction)
-        verify { integration.addNavigationActions(any()) }
-        verify(exactly = 2) { toolbar.addNavigationAction(any()) }
-    }
-
-    @Test
-    fun `GIVEN isTablet is true WHEN updateAddressBarNavigationActions is called THEN navigation buttons are added`() {
-        val toolbar: BrowserToolbar = mockk(relaxed = true)
-        val integration = spyk(getIntegration(toolbar))
-
-        assertNull(integration.forwardAction)
-        assertNull(integration.backAction)
-
-        integration.updateAddressBarNavigationActions(testContext, isWindowSizeSmall = false)
-
-        assertNotNull(integration.forwardAction)
-        assertNotNull(integration.backAction)
-        verify { integration.addNavigationActions(any()) }
-        verify(exactly = 2) { toolbar.addNavigationAction(any()) }
-    }
-
-    @Test
-    fun `GIVEN isTablet and isLandscape are false WHEN updateAddressBarNavigationActions is called THEN navigation buttons are removed`() {
-        val integration = spyk(getIntegration()).apply {
-            forwardAction = mockk()
-            backAction = mockk()
-        }
-
-        assertNotNull(integration.forwardAction)
-        assertNotNull(integration.backAction)
-
-        integration.updateAddressBarNavigationActions(testContext, isWindowSizeSmall = true)
-
-        assertNull(integration.forwardAction)
-        assertNull(integration.backAction)
-        verify { integration.removeNavigationActions() }
-        verify(exactly = 2) { toolbar.removeNavigationAction(any()) }
-    }
-
     private fun getIntegration(
         toolbar: BrowserToolbar = this.toolbar,
     ): CustomTabsIntegration {