diff --git a/.experimenter.yaml b/.experimenter.yaml
index 2859851e91..2b3eaeb84f 100644
--- a/.experimenter.yaml
+++ b/.experimenter.yaml
@@ -1,12 +1,4 @@
---
-default-browser-message:
- description: A small feature allowing experiments on the placement of a default browser message.
- hasExposure: true
- exposureDescription: ""
- variables:
- message-location:
- type: string
- description: Where is the message to be put.
engine-settings:
description: Contains a set of settings for controlling the web engine configurations.
hasExposure: true
diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index 646548a2f0..79ebdd92e8 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -1668,17 +1668,6 @@
column="18"/>
-
-
-
-
(R.string.pref_key_make_default_browser).updateSwitch()
- }
- }
-
private fun navigateFromSettings(directions: NavDirections) {
view?.findNavController()?.let { navController ->
if (navController.currentDestination?.id == R.id.settingsFragment) {
@@ -656,9 +620,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
}
}
- private fun isDefaultBrowserExperimentBranch(): Boolean =
- requireContext().settings().isDefaultBrowserMessageLocation(MessageSurfaceId.SETTINGS)
-
private fun isFirefoxDefaultBrowser(): Boolean {
val browsers = BrowsersCache.all(requireContext())
return browsers.isFirefoxDefaultBrowser
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 026a90d248..0a6c8693dd 100644
--- a/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
+++ b/app/src/main/java/org/mozilla/fenix/utils/Settings.kt
@@ -42,10 +42,8 @@ import org.mozilla.fenix.components.settings.lazyFeatureFlagPreference
import org.mozilla.fenix.components.toolbar.ToolbarPosition
import org.mozilla.fenix.ext.components
import org.mozilla.fenix.ext.getPreferenceKey
-import org.mozilla.fenix.nimbus.DefaultBrowserMessage
import org.mozilla.fenix.nimbus.FxNimbus
import org.mozilla.fenix.nimbus.HomeScreenSection
-import org.mozilla.fenix.nimbus.MessageSurfaceId
import org.mozilla.fenix.settings.PhoneFeature
import org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataOnQuitType
import org.mozilla.fenix.settings.logins.SavedLoginsSortingStrategyMenu
@@ -314,20 +312,6 @@ class Settings(private val appContext: Context) : PreferencesHolder {
default = false
)
- private val defaultBrowserFeature: DefaultBrowserMessage by lazy {
- FxNimbus.features.defaultBrowserMessage.value()
- }
-
- fun isDefaultBrowserMessageLocation(surfaceId: MessageSurfaceId): Boolean =
- defaultBrowserFeature.messageLocation?.let { experimentalSurfaceId ->
- if (experimentalSurfaceId == surfaceId) {
- val browsers = BrowsersCache.all(appContext)
- !browsers.isFirefoxDefaultBrowser
- } else {
- false
- }
- } ?: false
-
var gridTabView by booleanPreference(
appContext.getPreferenceKey(R.string.pref_key_tab_view_grid),
default = true
diff --git a/app/src/main/res/drawable/rounded_button_background.xml b/app/src/main/res/drawable/rounded_button_background.xml
deleted file mode 100644
index 63845527d5..0000000000
--- a/app/src/main/res/drawable/rounded_button_background.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- -
-
-
-
-
-
- -
-
-
-
-
-
-
diff --git a/app/src/main/res/layout/default_browser_experiment_preference.xml b/app/src/main/res/layout/default_browser_experiment_preference.xml
deleted file mode 100644
index b3777a25fe..0000000000
--- a/app/src/main/res/layout/default_browser_experiment_preference.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/xml/preferences_default_browser_experiment.xml b/app/src/main/res/xml/preferences_default_browser_experiment.xml
deleted file mode 100644
index b31b0a5650..0000000000
--- a/app/src/main/res/xml/preferences_default_browser_experiment.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/nimbus.fml.yaml b/nimbus.fml.yaml
index 58f3edb694..81cd9979e4 100644
--- a/nimbus.fml.yaml
+++ b/nimbus.fml.yaml
@@ -63,13 +63,6 @@ features:
- channel: developer
value:
enabled: true
- default-browser-message:
- description: A small feature allowing experiments on the placement of a default browser message.
- variables:
- message-location:
- description: Where is the message to be put.
- type: Option
- default: null
messaging:
description: |
Configuration for the messaging system.