diff --git a/app/src/main/java/org/mozilla/fenix/Config.kt b/app/src/main/java/org/mozilla/fenix/Config.kt index e289ce21ed..ae391ddb93 100644 --- a/app/src/main/java/org/mozilla/fenix/Config.kt +++ b/app/src/main/java/org/mozilla/fenix/Config.kt @@ -10,7 +10,7 @@ enum class ReleaseChannel { Nightly, Beta, Release, - ForkRelease + ForkRelease, ; val isReleased: Boolean diff --git a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt index a1a213ccdc..1a19a55bf2 100644 --- a/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/addons/AddonsManagementFragment.kt @@ -101,15 +101,17 @@ class AddonsManagementFragment : Fragment(R.layout.fragment_add_ons_management) searchView.imeOptions = EditorInfo.IME_ACTION_DONE searchView.queryHint = getString(R.string.addons_search_hint) - searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener { - override fun onQueryTextSubmit(query: String): Boolean { - return searchAddons(query.trim()) - } + searchView.setOnQueryTextListener( + object : SearchView.OnQueryTextListener { + override fun onQueryTextSubmit(query: String): Boolean { + return searchAddons(query.trim()) + } - override fun onQueryTextChange(newText: String): Boolean { - return searchAddons(newText.trim()) - } - },) + override fun onQueryTextChange(newText: String): Boolean { + return searchAddons(newText.trim()) + } + }, + ) } private fun searchAddons(addonNameSubStr: String): Boolean { diff --git a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt index 15c95f1825..ee8e0b3885 100644 --- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt +++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt @@ -274,29 +274,17 @@ class Settings(private val appContext: Context) : PreferencesHolder { val isTelemetryEnabled by booleanPreference( appContext.getPreferenceKey(R.string.pref_key_telemetry), -<<<<<<< HEAD - default = true, -======= - default = false ->>>>>>> e1281c453... Do all of Iceraven in one commit + default = false, ) var isMarketingTelemetryEnabled by booleanPreference( appContext.getPreferenceKey(R.string.pref_key_marketing_telemetry), -<<<<<<< HEAD - default = !Config.channel.isMozillaOnline, -======= - default = false ->>>>>>> e1281c453... Do all of Iceraven in one commit + default = false, ) var isExperimentationEnabled by booleanPreference( appContext.getPreferenceKey(R.string.pref_key_experimentation), -<<<<<<< HEAD - default = true, -======= - default = false ->>>>>>> e1281c453... Do all of Iceraven in one commit + default = false, ) var isOverrideTPPopupsForPerformanceTest = false @@ -736,12 +724,12 @@ class Settings(private val appContext: Context) : PreferencesHolder { var shouldStripUrl by booleanPreference( appContext.getPreferenceKey(R.string.pref_key_strip_url), - default = true + default = true, ) var shouldRelinquishMemoryUnderPressure by booleanPreference( appContext.getPreferenceKey(R.string.pref_key_relinquish_memory_under_pressure), - default = true + default = true, ) /** @@ -1145,12 +1133,12 @@ class Settings(private val appContext: Context) : PreferencesHolder { val customAddonsAccount by stringPreference( appContext.getPreferenceKey(R.string.pref_key_addons_custom_account), - BuildConfig.AMO_COLLECTION_USER + BuildConfig.AMO_COLLECTION_USER, ) val customAddonsCollection by stringPreference( appContext.getPreferenceKey(R.string.pref_key_addons_custom_collection), - BuildConfig.AMO_COLLECTION_NAME + BuildConfig.AMO_COLLECTION_NAME, ) var mobileBookmarksSize by intPreference( diff --git a/nimbus.fml.yaml b/nimbus.fml.yaml index be18e39665..1cb8ee274b 100644 --- a/nimbus.fml.yaml +++ b/nimbus.fml.yaml @@ -1,9 +1,4 @@ --- -about: - description: Nimbus Feature Manifest for Fenix (Firefox Android) - kotlin: - package: org.mozilla.fenix - class: .nimbus.FxNimbus channels: - release - forkRelease @@ -44,6 +39,41 @@ features: "pocket-sponsored-stories": true, } } + onboarding: + description: The onboarding features displayed on homescreen. + variables: + sections-enabled: + description: "This property provides a lookup table of whether or not the given section should be enabled." + type: Map + default: + { + "sync-cfr": false, + "wallpapers": false, + "home-onboarding-dialog": false, + "jump-back-in-cfr": false, + "first-run-onboarding": false, + } + defaults: + - channel: nightly + value: { + "sections-enabled": { + "sync-cfr": false, + "wallpapers": false, + "home-onboarding-dialog": false, + "jump-back-in-cfr": false, + "first-run-onboarding": false, + } + } + - channel: developer + value: { + "sections-enabled": { + "sync-cfr": false, + "wallpapers": true, + "home-onboarding-dialog": false, + "jump-back-in-cfr": false, + "first-run-onboarding": false, + } + } nimbus-validation: description: "A feature that does not correspond to an application feature suitable for showing that Nimbus is working. This should never be used in production." @@ -190,10 +220,11 @@ features: type: Map default: { - "home-onboarding-dialog-existing-users": true, - "sync-cfr": true, - "wallpapers-selection-tool": true, - "jump-back-in-cfr": true, + "home-onboarding-dialog-new-users": false, + "home-onboarding-dialog-existing-users": false, + "sync-cfr": false, + "wallpapers-selection-tool": false, + "jump-back-in-cfr": false, "tcp-cfr": false, "tcp-feature": false } @@ -201,10 +232,13 @@ features: - channel: developer value: { "sections-enabled": { + "home-onboarding-dialog-new-users": true, "home-onboarding-dialog-existing-users": true, "sync-cfr": true, "wallpapers-selection-tool": true, "jump-back-in-cfr": true, + "tcp-cfr": true, + "tcp-feature": true } } @@ -220,6 +254,17 @@ features: value: enabled: false + engine-settings: + description: Contains a set of settings for controlling the web engine configurations. + variables: + tabs-prioritization-enabled: + description: If true, enables tabs prioritization feature. + type: Boolean + default: true + total-cookie-protection-enabled: + description: If true, enables the total cookie protection in all browsing modes. + type: Boolean + default: false types: objects: MessageData: @@ -318,11 +363,26 @@ types: description: A setting in the settings screen. homescreen-banner: description: A banner in the homescreen. + OnboardingSection: + description: The identifiers for the sections of the onboarding. + variants: + sync-cfr: + description: Sync onboarding CFR. + wallpapers: + description: Wallpapers onboarding dialog. + home-onboarding-dialog: + description: Home onboarding dialog for upgraded users. + jump-back-in-cfr: + description: Jump back in onboarding CFR. + first-run-onboarding: + description: First run onboarding page updates. MR2022Section: description: The identifiers for the sections of the MR 2022. variants: home-onboarding-dialog-existing-users: description: Home onboarding dialog for upgraded users. + home-onboarding-dialog-new-users: + description: Home onboarding dialog for new users. sync-cfr: description: CFR for the first time you see a synced tab on the home screen. wallpapers-selection-tool: