Verified Commit f5f52533 authored by brizental's avatar brizental Committed by boklm
Browse files

[android] Override settings

parent 931ee943

mobile/android/fenix/app/nimbus.fml.yaml

+1 −1
Original line number Diff line number Diff line
@@ -663,7 +663,7 @@ features: 
        description: >

          Whether or not to enable tab strip.

        type: Boolean

        default: true

        default: false

      allow-on-all-devices:

        description: >

          Experimental: When true, bypasses device restrictions and enables use on all devices.

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

+12 −21
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ class Settings( 
     */

    var showBookmarksHomeFeature by booleanPreference(

        appContext.getPreferenceKey(R.string.pref_key_customization_bookmarks),

        default = { homescreenSections[HomeScreenSection.BOOKMARKS] == true },

        default = { true },

    )



    /**
@@ -193,7 +193,7 @@ class Settings( 
     */

    var showRecentTabsFeature by booleanPreference(

        appContext.getPreferenceKey(R.string.pref_key_recent_tabs),

        default = { homescreenSections[HomeScreenSection.JUMP_BACK_IN] == true },

        default = { true },

    )



    /**
@@ -202,7 +202,7 @@ class Settings( 
    var showPocketRecommendationsFeature by lazyFeatureFlagBooleanPreference(

        appContext.getPreferenceKey(R.string.pref_key_pocket_homescreen_recommendations),

        featureFlag = ContentRecommendationsFeatureHelper.isContentRecommendationsFeatureEnabled(appContext),

        defaultValue = { homescreenSections[HomeScreenSection.POCKET] == true },

        defaultValue = { false },

    )



    /**
@@ -240,7 +240,7 @@ class Settings( 
     */

    val showPocketSponsoredStories by lazyFeatureFlagBooleanPreference(

        key = appContext.getPreferenceKey(R.string.pref_key_pocket_sponsored_stories),

        defaultValue = { homescreenSections[HomeScreenSection.POCKET_SPONSORED_STORIES] == true },

        defaultValue = { false },

        featureFlag = ContentRecommendationsFeatureHelper.isPocketSponsoredStoriesFeatureEnabled(appContext),

    )
@@ -249,7 +249,7 @@ class Settings( 
     */

    var historyMetadataUIFeature by booleanPreference(

        appContext.getPreferenceKey(R.string.pref_key_history_metadata_feature),

        default = { homescreenSections[HomeScreenSection.RECENT_EXPLORATIONS] == true },

        default = { true },

    )



    /**
@@ -283,7 +283,7 @@ class Settings( 
     */

    var showTopSitesFeature by booleanPreference(

        appContext.getPreferenceKey(R.string.pref_key_show_top_sites),

        default = { homescreenSections[HomeScreenSection.TOP_SITES] == true },

        default = { false },

    )



    private val homescreenSections: Map<HomeScreenSection, Boolean>
@@ -1032,7 +1032,7 @@ class Settings( 


    var whatsappLinkSharingEnabled by booleanPreference(

        key = appContext.getPreferenceKey(R.string.pref_key_link_sharing),

        default = { FxNimbus.features.sentFromFirefox.value().enabled },

        default = { false },

    )



    var linkSharingSettingsSnackbarShown by booleanPreference(
@@ -1110,13 +1110,13 @@ class Settings( 
        get() = false // cookieBannersSection[CookieBannersSection.FEATURE_UI] == 1



    val shouldEnableCookieBannerDetectOnly: Boolean

        get() = cookieBannersSection[CookieBannersSection.FEATURE_SETTING_DETECT_ONLY] == 1

        get() = false



    val shouldEnableCookieBannerGlobalRules: Boolean

        get() = cookieBannersSection[CookieBannersSection.FEATURE_SETTING_GLOBAL_RULES] == 1

        get() = false



    val shouldEnableCookieBannerGlobalRulesSubFrame: Boolean

        get() = cookieBannersSection[CookieBannersSection.FEATURE_SETTING_GLOBAL_RULES_SUB_FRAMES] == 1

        get() = false



    /**

     * Declared as a function for performance purposes. This could be declared as a variable using
@@ -1173,8 +1173,7 @@ class Settings( 
     * Indicates if the re-engagement notification feature is enabled

     */

    val reEngagementNotificationType: Int

        get() =

            FxNimbus.features.reEngagementNotification.value().type

        get() = 0



    val shouldUseAutoBatteryTheme by booleanPreference(

        appContext.getPreferenceKey(R.string.pref_key_auto_battery_theme),
@@ -2120,15 +2119,7 @@ class Settings( 
        hasUserBeenOnboarded: Boolean,

        isLauncherIntent: Boolean,

    ): Boolean {

        val shouldShowByDefaultConditions = featureEnabled && !hasUserBeenOnboarded && isLauncherIntent



        val shouldShow = shouldShowByDefaultConditions || enablePersistentOnboarding



        if (shouldShow) {

            FxNimbus.features.junoOnboarding.recordExposure()

        }



        return shouldShow

        return false

    }



    /**

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

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ 
        <androidx.preference.Preference

            android:key="@string/pref_key_link_sharing"

            app:iconSpaceReserved="false"

            app:isPreferenceVisible="false"

            android:title="@string/preferences_link_sharing" />



        <androidx.preference.Preference