For #19876 - Part 2: Add a Home screen button to the browser toolbar

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

@@ -76,6 +76,14 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
             )
         }
 
+        val homeAction = BrowserToolbar.Button(
+            imageDrawable = AppCompatResources.getDrawable(requireContext(), R.drawable.ic_home)!!,
+            contentDescription = requireContext().getString(R.string.browser_toolbar_home),
+            listener = browserToolbarInteractor::onHomeButtonClicked
+        )
+
+        browserToolbarView.view.addNavigationAction(homeAction)
+
         val readerModeAction =
             BrowserToolbar.ToggleButton(
                 image = AppCompatResources.getDrawable(requireContext(), R.drawable.ic_readermode)!!,

app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarController.kt

@@ -23,6 +23,7 @@ import org.mozilla.fenix.browser.browsingmode.BrowsingMode
 import org.mozilla.fenix.browser.readermode.ReaderModeController
 import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.components.metrics.MetricController
+import org.mozilla.fenix.components.toolbar.interactor.BrowserToolbarInteractor
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.navigateBlockingForAsyncNavGraph
 import org.mozilla.fenix.ext.nav
@@ -40,6 +41,11 @@ interface BrowserToolbarController {
     fun handleTabCounterClick()
     fun handleTabCounterItemInteraction(item: TabCounterMenu.Item)
     fun handleReaderModePressed(enabled: Boolean)
+
+    /**
+     * @see [BrowserToolbarInteractor.onHomeButtonClicked]
+     */
+    fun handleHomeButtonClick()
 }
 
 class DefaultBrowserToolbarController(
@@ -157,6 +163,12 @@ class DefaultBrowserToolbarController(
         }
     }
 
+    override fun handleHomeButtonClick() {
+        navController.navigateBlockingForAsyncNavGraph(
+            BrowserFragmentDirections.actionGlobalHome()
+        )
+    }
+
     companion object {
         internal const val TELEMETRY_BROWSER_IDENTIFIER = "browserMenu"
     }

app/src/main/java/org/mozilla/fenix/components/toolbar/interactor/BrowserToolbarInteractor.kt

@@ -22,6 +22,11 @@ interface BrowserToolbarInteractor {
     fun onTabCounterMenuItemTapped(item: TabCounterMenu.Item)
     fun onScrolled(offset: Int)
     fun onReaderModePressed(enabled: Boolean)
+
+    /**
+     * Navigates to the Home screen. Called when a user taps on the Home button.
+     */
+    fun onHomeButtonClicked()
 }
 
 /**
@@ -68,4 +73,8 @@ class DefaultBrowserToolbarInteractor(
     override fun onReaderModePressed(enabled: Boolean) {
         browserToolbarController.handleReaderModePressed(enabled)
     }
+
+    override fun onHomeButtonClicked() {
+        browserToolbarController.handleHomeButtonClick()
+    }
 }

app/src/main/res/values/strings.xml

@@ -173,6 +173,10 @@
     <!-- Browser menu label for editing a bookmark -->
     <string name="browser_menu_edit">Edit</string>
 
+    <!-- Browser Toolbar -->
+    <!-- Content description for the Home screen button on the browser toolbar -->
+    <string name="browser_toolbar_home">Home screen</string>
+
     <!-- Error message to show when the user tries to access a scheme not
         handled by the app (Ex: blob, tel etc) -->
     <string name="unknown_scheme_error_message">Unable to connect. Unrecognizable URL scheme.</string>

app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarControllerTest.kt

@@ -312,6 +312,14 @@ class DefaultBrowserToolbarControllerTest {
         verify(exactly = 0) { engineView.setVerticalClipping(10) }
     }
 
+    @Test
+    fun handleHomeButtonClick() {
+        val controller = createController()
+        controller.handleHomeButtonClick()
+
+        verify { navController.navigate(BrowserFragmentDirections.actionGlobalHome()) }
+    }
+
     private fun createController(
         activity: HomeActivity = this.activity,
         customTabSessionId: String? = null

app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarInteractorTest.kt

@@ -68,4 +68,11 @@ class DefaultBrowserToolbarInteractorTest {
 
         verify { browserToolbarMenuController.handleToolbarItemInteraction(item) }
     }
+
+    @Test
+    fun onHomeButtonClicked() {
+        interactor.onHomeButtonClicked()
+
+        verify { browserToolbarController.handleHomeButtonClick() }
+    }
 }