ishan
/
fenix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

For #26620 - Replace the onboarding nimbus feature with MR2022 nimbus feature

This commit is contained in:
Gabriel Luong 2022-08-24 12:33:11 -04:00 committed by mergify[bot]
parent 9779a544a9
commit da677dd650
3 changed files with 8 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.experimenter.yaml
View File

@ -66,14 +66,6 @@ nimbus-validation:
settings-title:
type: string
description: The title of displayed in the Settings screen and app menu.
onboarding:
description: The onboarding features displayed on homescreen.
hasExposure: true
exposureDescription: ""
variables:
sections-enabled:
type: json
description: This property provides a lookup table of whether or not the given section should be enabled.
search-term-groups:
description: A feature allowing the grouping of URLs around the search term that it came from.
hasExposure: true

16
app/src/main/java/org/mozilla/fenix/utils/Settings.kt
View File

@ -43,7 +43,7 @@ import org.mozilla.fenix.ext.components
import org.mozilla.fenix.ext.getPreferenceKey
import org.mozilla.fenix.nimbus.FxNimbus
import org.mozilla.fenix.nimbus.HomeScreenSection
import org.mozilla.fenix.nimbus.OnboardingSection
import org.mozilla.fenix.nimbus.Mr2022Section
import org.mozilla.fenix.settings.PhoneFeature
import org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataOnQuitType
import org.mozilla.fenix.settings.logins.SavedLoginsSortingStrategyMenu
@ -196,7 +196,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
val showWallpaperOnboarding by lazyFeatureFlagPreference(
key = appContext.getPreferenceKey(R.string.pref_key_wallpapers_onboarding),
featureFlag = FeatureFlags.wallpaperOnboardingEnabled,
default = { onboardScreenSection[OnboardingSection.WALLPAPERS] == true },
default = { mr2022Sections[Mr2022Section.WALLPAPERS_SELECTION_TOOL] == true },
)
var openLinksInAPrivateTab by booleanPreference(
@ -862,7 +862,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
var shouldShowJumpBackInCFR by lazyFeatureFlagPreference(
appContext.getPreferenceKey(R.string.pref_key_should_show_jump_back_in_tabs_popup),
featureFlag = FeatureFlags.showJumpBackInCFR,
default = { onboardScreenSection[OnboardingSection.JUMP_BACK_IN_CFR] == true },
default = { mr2022Sections[Mr2022Section.JUMP_BACK_IN_CFR] == true },
)
fun getSitePermissionsPhoneFeatureAction(
@ -1196,8 +1196,8 @@ class Settings(private val appContext: Context) : PreferencesHolder {
default = false
)
private val onboardScreenSection: Map<OnboardingSection, Boolean> get() =
FxNimbus.features.onboarding.value().sectionsEnabled
private val mr2022Sections: Map<Mr2022Section, Boolean> get() =
FxNimbus.features.mr2022.value().sectionsEnabled
private val homescreenSections: Map<HomeScreenSection, Boolean> get() =
FxNimbus.features.homescreen.value().sectionsEnabled
@ -1215,7 +1215,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
var showSyncCFR by lazyFeatureFlagPreference(
appContext.getPreferenceKey(R.string.pref_key_should_show_sync_cfr),
featureFlag = FeatureFlags.showSynCFR,
default = { onboardScreenSection[OnboardingSection.SYNC_CFR] == true },
default = { mr2022Sections[Mr2022Section.SYNC_CFR] == true },
)
/**
@ -1224,7 +1224,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
var showHomeOnboardingDialog by lazyFeatureFlagPreference(
appContext.getPreferenceKey(R.string.pref_key_should_show_home_onboarding_dialog),
featureFlag = FeatureFlags.showHomeOnboarding,
default = { onboardScreenSection[OnboardingSection.HOME_ONBOARDING_DIALOG] == true },
default = { mr2022Sections[Mr2022Section.HOME_ONBOARDING_DIALOG_EXISTING_USERS] == true },
)
/**
@ -1233,7 +1233,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
var showFirstRunOnboardingUpdate by lazyFeatureFlagPreference(
appContext.getPreferenceKey(R.string.pref_key_show_first_run_onboarding_update),
featureFlag = FeatureFlags.showFirstRunOnboardingUpdates,
default = { onboardScreenSection[OnboardingSection.FIRST_RUN_ONBOARDING] == true },
default = { mr2022Sections[Mr2022Section.HOME_ONBOARDING_DIALOG_NEW_USERS] == true },
)
/**

48
nimbus.fml.yaml
View File

@ -43,41 +43,6 @@ 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<OnboardingSection, Boolean>
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."
@ -367,19 +332,6 @@ 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: