tor-browser

commit 43d3a1ba9a1ed3b52a1e757b4321666b6bba7033
parent 49beffa1c06658c2098602c62e68fb6697c6439a
Author: rmalicdem <rmalicdem@mozilla.com>
Date:   Thu, 13 Nov 2025 20:31:28 +0000

Bug 1969081 - Show simple toolbar shortcut when expanded toolbar is used but navbar is hidden r=android-reviewers,Roger

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

Diffstat:
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/TabPreview.kt
 | 
4
++--
M
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMiddleware.kt
 | 
4
++--
M
mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMiddlewareTest.kt
 | 
17
+++++++++++++++++

3 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/TabPreview.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/TabPreview.kt
@@ -527,7 +527,7 @@ class TabPreview @JvmOverloads constructor(
         val tabStripEnabled = settings.isTabStripEnabled
         val shouldUseExpandedToolbar = settings.shouldUseExpandedToolbar
 
-        val useCustomPrimary = settings.shouldShowToolbarCustomization && !shouldUseExpandedToolbar
+        val useCustomPrimary = settings.shouldShowToolbarCustomization
         val primarySlotAction = mapShortcutToAction(
             settings.toolbarSimpleShortcutKey,
             ToolbarAction.NewTab,
@@ -566,7 +566,7 @@ class TabPreview @JvmOverloads constructor(
         val isTallWindow = context.isTallWindow()
         val shouldUseExpandedToolbar = settings.shouldUseExpandedToolbar
 
-        val useCustomPrimary = settings.shouldShowToolbarCustomization && shouldUseExpandedToolbar
+        val useCustomPrimary = settings.shouldShowToolbarCustomization
         val primarySlotAction = mapShortcutToAction(
             settings.toolbarExpandedShortcutKey,
             getBookmarkAction(isBookmarked),
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMiddleware.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMiddleware.kt
@@ -774,7 +774,7 @@ class BrowserToolbarMiddleware(
         val isTallWindow = environment?.fragment?.isTallWindow() == true
         val tabStripEnabled = settings.isTabStripEnabled
         val shouldUseExpandedToolbar = settings.shouldUseExpandedToolbar
-        val useCustomPrimary = settings.shouldShowToolbarCustomization && !shouldUseExpandedToolbar
+        val useCustomPrimary = settings.shouldShowToolbarCustomization
         val primarySlotAction = mapShortcutToAction(
             settings.toolbarSimpleShortcutKey,
             ToolbarAction.NewTab,
@@ -818,7 +818,7 @@ class BrowserToolbarMiddleware(
         val isWideWindow = environment.fragment.isWideWindow()
         val isTallWindow = environment.fragment.isTallWindow()
         val shouldUseExpandedToolbar = settings.shouldUseExpandedToolbar
-        val useCustomPrimary = settings.shouldShowToolbarCustomization && shouldUseExpandedToolbar
+        val useCustomPrimary = settings.shouldShowToolbarCustomization
         val primarySlotAction = mapShortcutToAction(
             settings.toolbarExpandedShortcutKey,
             getBookmarkAction(isBookmarked),
diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMiddlewareTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMiddlewareTest.kt
@@ -2976,6 +2976,23 @@ class BrowserToolbarMiddlewareTest {
     }
 
     @Test
+    fun `GIVEN expanded toolbar is used and navbar is hidden WHEN building end browser actions THEN use simple toolbar shortcuts`() = runTest {
+        configuration = Configuration().apply {
+            screenHeightDp = 400
+            screenWidthDp = 700
+        }
+        every { mockContext.resources.configuration } returns configuration
+        every { settings.shouldShowToolbarCustomization } returns true
+        every { settings.shouldUseExpandedToolbar } returns true
+        every { settings.toolbarSimpleShortcutKey } returns ShortcutType.HOMEPAGE
+
+        val toolbarStore = buildStore()
+
+        val homepageButton = toolbarStore.state.displayState.browserActionsEnd[0] as ActionButtonRes
+        assertEquals(expectedHomepageButton(), homepageButton)
+    }
+
+    @Test
     fun `GIVEN simple toolbar use add bookmark shortcut AND the current page is not bookmarked WHEN initializing toolbar THEN show Bookmark in end browser actions`() = runTest {
         every { settings.shouldShowToolbarCustomization } returns true
         every { settings.toolbarSimpleShortcutKey } returns ShortcutType.BOOKMARK