Commit 413476e3 authored by Matthew Finkel's avatar Matthew Finkel Committed by brizental
Browse files

TB 34403 [android]: Disable Normal mode by default. 

Originally, fenix#34403.
parent c75f7234

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

+4 −0
Changes for mobile/android/fenix/app/src/main/java/org/mozilla/fenix/browser/browsingmode/BrowsingModeManager.kt: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -74,6 +74,10 @@ class DefaultBrowsingModeManager( 
     * Returns the [BrowsingMode] set by the [intent] or the last known [BrowsingMode].

     */

    private fun getModeFromIntentOrLastKnown(intent: Intent?): BrowsingMode {

        if (settings.shouldDisableNormalMode) {

            return BrowsingMode.Private

        }



        intent?.toSafeIntent()?.let {

            if (it.hasExtra(PRIVATE_BROWSING_MODE)) {

                val startPrivateMode = it.getBooleanExtra(PRIVATE_BROWSING_MODE, false)

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

+1 −1
Changes for mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ open class DefaultToolbarMenu( 
                newTabItem,

                BrowserMenuDivider(),

                bookmarksItem,

                historyItem,

                if (context.settings().shouldDisableNormalMode) null else historyItem,

                downloadsItem,

                passwordsItem,

                extensionsItem,

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

+3 −0
Changes for mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/HttpsOnlyFragment.kt: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ import android.view.ViewGroup 
import androidx.core.text.HtmlCompat

import androidx.core.text.getSpans

import androidx.core.view.children

import androidx.core.view.isGone

import androidx.fragment.app.Fragment

import org.mozilla.fenix.BrowserDirection

import org.mozilla.fenix.HomeActivity
@@ -60,6 +61,8 @@ class HttpsOnlyFragment : Fragment() { 
            updateEngineHttpsOnlyMode()

        }



        binding.httpsOnlyModes.isGone = requireContext().settings().shouldDisableNormalMode



        return binding.root

    }

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

+7 −1
Changes for mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt: 7 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -287,10 +287,16 @@ class SettingsFragment : PreferenceFragmentCompat() { 
        } else {

            getString(R.string.delete_browsing_data_quit_off)

        }

        // Hide "Delete browsing data on quit" when in Private Browsing-only mode

        deleteBrowsingDataPreference.isVisible =

            !deleteBrowsingDataPreference.context.settings().shouldDisableNormalMode





        if (!settings.shouldDisableNormalMode) {

            val tabSettingsPreference =

                requirePreference<Preference>(R.string.pref_key_tabs)

        tabSettingsPreference.summary = settings.getTabTimeoutString()

            tabSettingsPreference.summary = context?.settings()?.getTabTimeoutString()

        }



//        val autofillPreference = requirePreference<Preference>(R.string.pref_key_credit_cards)

//        autofillPreference.title = if (settings.addressFeature) {

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

+8 −0
Changes for mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TabsSettingsFragment.kt: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -34,6 +34,14 @@ class TabsSettingsFragment : PreferenceFragmentCompat() { 


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

        setPreferencesFromResource(R.xml.tabs_preferences, rootKey)



        findPreference<RadioButtonPreference>(getString(R.string.pref_key_close_tabs_manually))?.parent?.apply {

            isVisible = !context.settings().shouldDisableNormalMode

        }



        findPreference<PreferenceCategory>(getString(R.string.pref_key_inactive_tabs_category))?.apply {

            isVisible = !context.settings().shouldDisableNormalMode

        }

    }



    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {