TB 44694: [android] Remove new Tab bar feature (56815966) · Commits · The Tor Project / Applications / Tor Browser

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/CustomizationFragment.kt

+0 −15

Original line number	Diff line number	Diff line
		@@ -101,7 +101,6 @@ class CustomizationFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFrag
		setupRadioGroups()
		val tabletAndTabStripEnabled = Settings(requireContext()).isTabStripEnabled
		updateToolbarCategoryBasedOnTabStrip(tabletAndTabStripEnabled)
		setupTabStripCategory()
		updateToolbarShortcut()

		// if tab strip is enabled, swipe toolbar to switch tabs should not be enabled so the
		@@ -266,20 +265,6 @@ class CustomizationFragment : PreferenceFragmentCompat(), SystemInsetsPaddedFrag
		addToRadioGroup(topPreference, bottomPreference)
		}

		private fun setupTabStripCategory() {
		val tabStripSwitch = requirePreference<SwitchPreferenceCompat>(R.string.pref_key_tab_strip_show)
		val context = requireContext()

		tabStripSwitch.isChecked = Settings(requireContext()).isTabStripEnabled

		tabStripSwitch.setOnPreferenceChangeListener { _, newValue ->
		val enabled = newValue as Boolean
		context.components.settings.isTabStripEnabled = enabled
		updateToolbarCategoryBasedOnTabStrip(enabled)
		true
		}
		}

		private fun setupGesturesCategory(
		isSwipeToolbarToSwitchTabsVisible: Boolean,
		isSummarizationEnabled: Boolean,

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt

+1 −5

Original line number	Diff line number	Diff line
		@@ -2125,11 +2125,7 @@ class Settings(
		var shouldShowSearchOptimizationFlightCard = false
		var shouldShowSearchOptimizationSportCard = false

		var isTabStripEnabled by booleanPreference(
		appContext.getPreferenceKey(R.string.pref_key_tab_strip_show),
		default = FxNimbus.features.tabStrip.value().enabled &&
		(isTabStripEligible(appContext) \|\| FxNimbus.features.tabStrip.value().allowOnAllDevices),
		)
		val isTabStripEnabled = false

		var isDynamicToolbarEnabled = false

mobile/android/fenix/app/src/main/res/xml/customization_preferences.xml

+0 −9

Original line number	Diff line number	Diff line
		@@ -61,15 +61,6 @@
		android:selectable="false" />
		</androidx.preference.PreferenceCategory>

		<androidx.preference.PreferenceCategory
		android:layout="@layout/preference_cat_style"
		android:title="@string/preferences_tab_strip"
		app:iconSpaceReserved="false">
		<androidx.preference.SwitchPreferenceCompat
		android:key="@string/pref_key_tab_strip_show"
		android:title="@string/preference_tab_strip_show" />
		</androidx.preference.PreferenceCategory>

		<!-- Toolbar shortcut picker -->
		<androidx.preference.PreferenceCategory
		android:key="@string/pref_key_customization_category_toolbar_shortcut"

mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMiddlewareTest.kt

+14 −14

Original line number	Diff line number	Diff line
		@@ -224,7 +224,7 @@ class BrowserToolbarMiddlewareTest {
		coEvery { bookmarksStorage.getBookmarksWithUrl(any()) } returns Result.success(listOf(mockk()))
		settings.shouldUseBottomToolbar = false
		settings.shouldUseExpandedToolbar = false
		settings.isTabStripEnabled = false
		// settings.isTabStripEnabled = false
		}

		@Test
		@@ -1266,7 +1266,7 @@ class BrowserToolbarMiddlewareTest {

		@Test
		fun `GIVEN on a small screen with tabstrip is disabled and not using the extended layout THEN don't show a share button as page end action`() {
		settings.isTabStripEnabled = false
		// settings.isTabStripEnabled = false
		settings.shouldUseExpandedToolbar = false

		val browserScreenStore = buildBrowserScreenStore()
		@@ -1278,7 +1278,7 @@ class BrowserToolbarMiddlewareTest {

		@Test
		fun `GIVEN on a wide screen with tabstrip is disabled THEN show a share button as page end action`() {
		settings.isTabStripEnabled = false
		// settings.isTabStripEnabled = false
		val browserScreenStore = buildBrowserScreenStore()
		val middleware = buildMiddleware(
		browserScreenStore = browserScreenStore,
		@@ -1292,7 +1292,7 @@ class BrowserToolbarMiddlewareTest {

		@Test
		fun `GIVEN on a large screen with tabstrip is enabled THEN don't show a share button as page end action`() {
		settings.isTabStripEnabled = true
		// settings.isTabStripEnabled = true
		val browserScreenStore = buildBrowserScreenStore()
		val middleware = buildMiddleware(appStore, browserScreenStore)
		val toolbarStore = buildStore(middleware)
		@@ -1302,7 +1302,7 @@ class BrowserToolbarMiddlewareTest {

		@Test
		fun `GIVEN the current tab shows a content page WHEN the share shortcut is clicked THEN record telemetry and start sharing the local resource`() = runTest(testDispatcher) {
		settings.isTabStripEnabled = true
		// settings.isTabStripEnabled = true
		settings.shouldUseExpandedToolbar = false
		settings.toolbarSimpleShortcutKey = ShortcutType.SHARE.value
		val browserScreenStore = buildBrowserScreenStore()
		@@ -1337,7 +1337,7 @@ class BrowserToolbarMiddlewareTest {

		@Test
		fun `GIVEN the current tab shows a remote PDF WHEN the share shortcut is clicked THEN record telemetry and start sharing the remote resource`() {
		settings.isTabStripEnabled = true
		// settings.isTabStripEnabled = true
		settings.shouldUseExpandedToolbar = false
		settings.toolbarSimpleShortcutKey = ShortcutType.SHARE.value
		val browserScreenStore = buildBrowserScreenStore()
		@@ -1382,7 +1382,7 @@ class BrowserToolbarMiddlewareTest {

		@Test
		fun `GIVEN the current tab shows a normal webpage WHEN the share shortcut is clicked THEN record telemetry and open the share dialog`() {
		settings.isTabStripEnabled = true
		// settings.isTabStripEnabled = true
		settings.shouldUseExpandedToolbar = false
		settings.toolbarSimpleShortcutKey = ShortcutType.SHARE.value
		settings.nativeShareSheetEnabled = false
		@@ -1430,7 +1430,7 @@ class BrowserToolbarMiddlewareTest {

		@Test
		fun `WHEN the share shortcut is clicked THEN the share use case is invoked with the current tab's details`() {
		settings.isTabStripEnabled = true
		// settings.isTabStripEnabled = true
		settings.shouldUseExpandedToolbar = false
		settings.toolbarSimpleShortcutKey = ShortcutType.SHARE.value

		@@ -1471,7 +1471,7 @@ class BrowserToolbarMiddlewareTest {
		@Test
		fun `GIVEN on a small width with tabstrip is enabled and not using the extended layout THEN don't show a share button as browser end action`() {
		settings.shouldUseExpandedToolbar = false
		settings.isTabStripEnabled = true
		// settings.isTabStripEnabled = true
		val browserScreenStore = buildBrowserScreenStore()
		val middleware = buildMiddleware(
		browserScreenStore = browserScreenStore,
		@@ -1491,7 +1491,7 @@ class BrowserToolbarMiddlewareTest {

		@Test
		fun `GIVEN expanded toolbar with tabstrip and tall window WHEN changing to short window THEN show new tab, tab counter and menu`() = runTest(testDispatcher) {
		settings.isTabStripEnabled = true
		// settings.isTabStripEnabled = true
		settings.shouldUseExpandedToolbar = true
		val browserScreenStore = buildBrowserScreenStore()
		var isWideScreen = false
		@@ -1526,7 +1526,7 @@ class BrowserToolbarMiddlewareTest {

		@Test
		fun `GIVEN on a wide window with tabstrip and extended layout enabled THEN don't show a share button as browser end action`() {
		settings.isTabStripEnabled = true
		// settings.isTabStripEnabled = true
		settings.shouldUseExpandedToolbar = true

		val browserScreenStore = buildBrowserScreenStore()
		@@ -1539,7 +1539,7 @@ class BrowserToolbarMiddlewareTest {
		@Test
		fun `WHEN cycling through tall window and wide window THEN update what end page actions should be shown`() {
		val appStore = AppStore()
		settings.isTabStripEnabled = false
		// settings.isTabStripEnabled = false
		settings.shouldUseExpandedToolbar = false
		val readerModeStatus: ReaderModeStatus = mockk(relaxed = true) {
		every { isAvailable } returns true
		@@ -3156,7 +3156,7 @@ class BrowserToolbarMiddlewareTest {

		@Test
		fun `GIVEN share shortcut is selected THEN update end page actions without share action`() = runTest(testDispatcher) {
		settings.isTabStripEnabled = false
		// settings.isTabStripEnabled = false
		settings.toolbarSimpleShortcutKey = ShortcutType.SHARE.value
		val browserScreenStore = buildBrowserScreenStore()
		val middleware = buildMiddleware(
		@@ -3353,7 +3353,7 @@ class BrowserToolbarMiddlewareTest {

		@Test
		fun `GIVEN simple toolbar use share shortcut AND wide window with tabstrip enabled WHEN initializing toolbar THEN only show one Share in end browser actions`() {
		settings.isTabStripEnabled = true
		// settings.isTabStripEnabled = true
		settings.toolbarSimpleShortcutKey = ShortcutType.SHARE.value

		val middleware = buildMiddleware(

mobile/android/fenix/app/src/test/java/org/mozilla/fenix/tabstray/TabManagerCfrControllerTest.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@ class TabManagerCfrControllerTest {
		@Test
		fun `GIVEN an adjacent tab WHEN maybeMarkTabSwipeCfrReady is called THEN shouldShowTabSwipeCfr is set`() {
		settings.hasShownTabSwipeCFR = false
		settings.isTabStripEnabled = false
		// settings.isTabStripEnabled = false
		settings.isSwipeToolbarToSwitchTabsEnabled = true
		settings.shouldShowTabSwipeCFR = false
		val adjacentTab = createTab(id = "tab2", url = "")