mirror of
https://github.com/ironfox-oss/IronFox.git
synced 2026-01-26 15:03:43 -05:00
164 lines
8.0 KiB
Diff
164 lines
8.0 KiB
Diff
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
|
|
index e7e19273f9..8572b6bfdb 100644
|
|
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
|
|
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
|
|
@@ -179,7 +179,7 @@ open class DefaultToolbarMenu(
|
|
@VisibleForTesting(otherwise = PRIVATE)
|
|
fun shouldShowOpenInRegularTab(): Boolean = selectedSession?.let { session ->
|
|
// This feature is gated behind Nightly for the time being.
|
|
- Config.channel.isNightlyOrDebug &&
|
|
+ true &&
|
|
// This feature is explicitly for users opening links in private tabs.
|
|
context.settings().openLinksInAPrivateTab &&
|
|
// and is only visible in private tabs.
|
|
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
|
|
index a77d48d282..7ba7483cc6 100644
|
|
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
|
|
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
|
|
@@ -25,7 +25,7 @@ object FeatureFlags {
|
|
/**
|
|
* Enables the Sync Addresses feature.
|
|
*/
|
|
- const val SYNC_ADDRESSES_FEATURE = false
|
|
+ const val SYNC_ADDRESSES_FEATURE = true
|
|
|
|
/**
|
|
* Enables new search settings UI with two extra fragments, for managing the default engine
|
|
@@ -64,5 +64,5 @@ object FeatureFlags {
|
|
/**
|
|
* Determines whether to show live downloads in progress in the UI.
|
|
*/
|
|
- val showLiveDownloads = Config.channel.isNightlyOrDebug
|
|
+ val showLiveDownloads = true
|
|
}
|
|
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
|
|
index ac0f3bc013..637a4f8c2f 100644
|
|
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
|
|
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SecretSettingsFragment.kt
|
|
@@ -64,7 +64,7 @@ class SecretSettingsFragment : PreferenceFragmentCompat() {
|
|
}
|
|
|
|
requirePreference<SwitchPreference>(R.string.pref_key_enable_composable_toolbar).apply {
|
|
- isVisible = Config.channel.isDebug
|
|
+ isVisible = true
|
|
isChecked = context.settings().shouldUseComposableToolbar
|
|
onPreferenceChangeListener = SharedPreferenceUpdater()
|
|
}
|
|
@@ -86,19 +86,19 @@ class SecretSettingsFragment : PreferenceFragmentCompat() {
|
|
}
|
|
|
|
requirePreference<SwitchPreference>(R.string.pref_key_enable_menu_redesign).apply {
|
|
- isVisible = Config.channel.isNightlyOrDebug
|
|
+ isVisible = true
|
|
isChecked = context.settings().enableMenuRedesign
|
|
onPreferenceChangeListener = SharedPreferenceUpdater()
|
|
}
|
|
|
|
requirePreference<SwitchPreference>(R.string.pref_key_enable_homepage_searchbar).apply {
|
|
- isVisible = Config.channel.isNightlyOrDebug
|
|
+ isVisible = true
|
|
isChecked = context.settings().enableHomepageSearchBar
|
|
onPreferenceChangeListener = SharedPreferenceUpdater()
|
|
}
|
|
|
|
requirePreference<SwitchPreference>(R.string.pref_key_enable_homepage_as_new_tab).apply {
|
|
- isVisible = Config.channel.isNightlyOrDebug
|
|
+ isVisible = true
|
|
isChecked = context.settings().enableHomepageAsNewTab
|
|
onPreferenceChangeListener = SharedPreferenceUpdater()
|
|
}
|
|
@@ -114,7 +114,7 @@ class SecretSettingsFragment : PreferenceFragmentCompat() {
|
|
}
|
|
|
|
requirePreference<SwitchPreference>(R.string.pref_key_enable_unified_trust_panel).apply {
|
|
- isVisible = Config.channel.isNightlyOrDebug
|
|
+ isVisible = true
|
|
isChecked = context.settings().enableUnifiedTrustPanel
|
|
onPreferenceChangeListener = SharedPreferenceUpdater()
|
|
}
|
|
diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
|
|
index 8913d9f230..b2f10505f6 100644
|
|
--- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
|
|
+++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
|
|
@@ -335,7 +335,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
|
|
var privateBrowsingLockedFeatureEnabled by lazyFeatureFlagPreference(
|
|
key = appContext.getPreferenceKey(R.string.pref_key_private_browsing_locked_enabled),
|
|
featureFlag = true,
|
|
- default = { FxNimbus.features.privateBrowsingLock.value().enabled },
|
|
+ default = { true },
|
|
)
|
|
|
|
var privateBrowsingModeLocked by booleanPreference(
|
|
@@ -485,7 +485,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
|
|
*/
|
|
var isShortcutSuggestionsVisible by lazyFeatureFlagPreference(
|
|
key = appContext.getPreferenceKey(R.string.pref_key_enable_shortcuts_suggestions),
|
|
- default = { FxNimbus.features.topSitesSuggestions.value().enabled },
|
|
+ default = { true },
|
|
featureFlag = true,
|
|
)
|
|
|
|
@@ -1635,7 +1635,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
|
|
"en-CA",
|
|
"fr-CA",
|
|
)
|
|
- val currentlyEnabledLanguages = if (Config.channel.isNightlyOrDebug) {
|
|
+ val currentlyEnabledLanguages = if (true) {
|
|
releaseEnabledLanguages + SharedPrefsAddressesDebugLocalesRepository(context)
|
|
.getAllEnabledLocales().map { it.langTag }
|
|
} else {
|
|
@@ -1857,7 +1857,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
|
|
|
|
var shouldUseComposableToolbar by lazyFeatureFlagPreference(
|
|
key = appContext.getPreferenceKey(R.string.pref_key_enable_composable_toolbar),
|
|
- default = { FxNimbus.features.composableToolbar.value().enabled },
|
|
+ default = { false },
|
|
featureFlag = true,
|
|
)
|
|
|
|
@@ -1867,7 +1867,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
|
|
@VisibleForTesting
|
|
internal var toolbarRedesignEnabled by booleanPreference(
|
|
appContext.getPreferenceKey(R.string.pref_key_enable_toolbar_redesign),
|
|
- default = { FxNimbus.features.toolbarRedesignOption.value().showOptions },
|
|
+ default = { true },
|
|
)
|
|
|
|
/**
|
|
@@ -1977,7 +1977,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
|
|
*/
|
|
var enableComposeHomepage by lazyFeatureFlagPreference(
|
|
key = appContext.getPreferenceKey(R.string.pref_key_enable_compose_homepage),
|
|
- default = { FxNimbus.features.composeHomepage.value().enabled },
|
|
+ default = { false },
|
|
featureFlag = true,
|
|
)
|
|
|
|
@@ -1986,7 +1986,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
|
|
*/
|
|
var enableMenuRedesign by lazyFeatureFlagPreference(
|
|
key = appContext.getPreferenceKey(R.string.pref_key_enable_menu_redesign),
|
|
- default = { FxNimbus.features.menuRedesign.value().enabled },
|
|
+ default = { false },
|
|
featureFlag = true,
|
|
)
|
|
|
|
@@ -1995,7 +1995,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
|
|
*/
|
|
var enableHomepageAsNewTab by lazyFeatureFlagPreference(
|
|
key = appContext.getPreferenceKey(R.string.pref_key_enable_homepage_as_new_tab),
|
|
- default = { FxNimbus.features.homepageAsNewTab.value().enabled },
|
|
+ default = { false },
|
|
featureFlag = true,
|
|
)
|
|
|
|
@@ -2004,7 +2004,7 @@ class Settings(private val appContext: Context) : PreferencesHolder {
|
|
*/
|
|
var enableHomepageSearchBar by lazyFeatureFlagPreference(
|
|
key = appContext.getPreferenceKey(R.string.pref_key_enable_homepage_searchbar),
|
|
- default = { FxNimbus.features.homepageSearchBar.value().enabled },
|
|
+ default = { false },
|
|
featureFlag = true,
|
|
)
|
|
|