Commit 2f6fcbf1 authored by Jonathan Almeida's avatar Jonathan Almeida Committed by Jonathan Almeida
Browse files

Close #13892: Remove Synced Tabs appended to tabs tray

parent 516a6a34

app/src/main/java/org/mozilla/fenix/FeatureFlags.kt

+0 −7
Original line number Diff line number Diff line
@@ -14,13 +14,6 @@ object FeatureFlags { 
     */

    val pullToRefreshEnabled = Config.channel.isNightlyOrDebug



    /**

     * Shows Synced Tabs in the tabs tray.

     *

     * Tracking issue: https://github.com/mozilla-mobile/fenix/issues/13892

     */

    val syncedTabsInTabsTray = Config.channel.isNightlyOrDebug



    /**

     * Enables the Nimbus experiments library.

     */

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

+2 −7
Original line number Diff line number Diff line
@@ -332,14 +332,12 @@ class DefaultToolbarMenu( 
            ?.browsingModeManager?.mode == BrowsingMode.Normal

        val shouldDeleteDataOnQuit = context.components.settings

            .shouldDeleteBrowsingDataOnQuit

        val syncedTabsInTabsTray = context.components.settings

            .syncedTabsInTabsTray



        val menuItems = listOfNotNull(

            downloadsItem,

            historyItem,

            bookmarksItem,

            if (syncedTabsInTabsTray) null else syncedTabs,

            syncedTabs,

            settings,

            if (shouldDeleteDataOnQuit) deleteDataOnQuit else null,

            BrowserMenuDivider(),
@@ -471,9 +469,6 @@ class DefaultToolbarMenu( 
            onItemTapped.invoke(ToolbarMenu.Item.Settings)

        }



        val syncedTabsInTabsTray = context.components.settings

            .syncedTabsInTabsTray



        val menuItems = listOfNotNull(

            newTabItem,

            BrowserMenuDivider(),
@@ -481,7 +476,7 @@ class DefaultToolbarMenu( 
            historyItem,

            downloadsItem,

            extensionsItem,

            if (syncedTabsInTabsTray) null else syncedTabsItem,

            syncedTabsItem,

            BrowserMenuDivider(),

            findInPageItem,

            desktopSiteItem,

app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ class HomeMenu( 
            if (settings.shouldDeleteBrowsingDataOnQuit) quitItem else null,

            settingsItem,

            BrowserMenuDivider(),

            if (settings.syncedTabsInTabsTray) null else syncedTabsItem,

            syncedTabsItem,

            bookmarksItem,

            historyItem,

            downloadsItem,

app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt

+0 −9
Original line number Diff line number Diff line
@@ -6,10 +6,7 @@ package org.mozilla.fenix.settings 


import android.os.Bundle

import androidx.preference.PreferenceFragmentCompat

import androidx.preference.SwitchPreference

import org.mozilla.fenix.FeatureFlags

import org.mozilla.fenix.R

import org.mozilla.fenix.ext.settings

import org.mozilla.fenix.ext.showToolbar



class SecretSettingsFragment : PreferenceFragmentCompat() {
@@ -21,11 +18,5 @@ class SecretSettingsFragment : PreferenceFragmentCompat() { 


    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {

        setPreferencesFromResource(R.xml.secret_settings_preferences, rootKey)



        requirePreference<SwitchPreference>(R.string.pref_key_synced_tabs_tabs_tray).apply {

            isVisible = FeatureFlags.syncedTabsInTabsTray

            isChecked = context.settings().syncedTabsInTabsTray

            onPreferenceChangeListener = SharedPreferenceUpdater()

        }

    }

}

app/src/main/java/org/mozilla/fenix/sync/SyncedTabsFragment.kt

+0 −6
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ import mozilla.components.browser.storage.sync.Tab 
import mozilla.components.feature.syncedtabs.SyncedTabsFeature

import mozilla.components.support.base.feature.ViewBoundFeatureWrapper

import org.mozilla.fenix.BrowserDirection

import org.mozilla.fenix.FeatureFlags

import org.mozilla.fenix.HomeActivity

import org.mozilla.fenix.R

import org.mozilla.fenix.ext.components
@@ -28,11 +27,6 @@ import org.mozilla.fenix.theme.ThemeManager 
class SyncedTabsFragment : LibraryPageFragment<Tab>() {

    private val syncedTabsFeature = ViewBoundFeatureWrapper<SyncedTabsFeature>()



    init {

        // Sanity-check: Remove this class when the feature flag is always enabled.

        FeatureFlags.syncedTabsInTabsTray

    }



    override fun onCreateView(

        inflater: LayoutInflater,

        container: ViewGroup?,