commit e6f25a8d314a64ce7e2ad887513e32b998588463 parent 46ff7e98c870723eb7e87cb4abadf6c9f3d8ab60 Author: Sandor Molnar <smolnar@mozilla.com> Date: Sat, 10 Jan 2026 00:04:14 +0200 Revert "Bug 1988163 - Split Studies into Feature Studies and Improvmenets r=beth,android-reviewers,android-l10n-reviewers,flod,twhite" for causing fenix debug failures This reverts commit 9b6a51bf85d42e04e2dd5dd1c5d224018e8fe5da. Diffstat:
20 files changed, 13 insertions(+), 164 deletions(-)
diff --git a/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDataCollectionRobot.kt b/mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsSubMenuDataCollectionRobot.kt @@ -58,7 +58,7 @@ class SettingsSubMenuDataCollectionRobot { itemWithDescription("Learn more about technical data Links available"), // Studies section itemContainingText(getStringResource(R.string.studies_data_category)), - itemContainingText(getStringResource(R.string.studies_title_2)), + itemContainingText(getStringResource(R.string.studies_title)), itemContainingText(studiesSummary), // Usage data section itemContainingText(getStringResource(R.string.usage_data_category)), @@ -139,7 +139,7 @@ class SettingsSubMenuDataCollectionRobot { fun clickStudiesOption() { Log.i(TAG, "clickStudiesOption: Trying to click the \"Studies\" option") - itemContainingText(getStringResource(R.string.studies_title_2)).click() + itemContainingText(getStringResource(R.string.studies_title)).click() Log.i(TAG, "clickStudiesOption: Clicked the \"Studies\" option") } diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/RemoteImprovementsFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/RemoteImprovementsFragment.kt @@ -1,52 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.mozilla.fenix.settings - -import android.os.Bundle -import androidx.preference.Preference -import androidx.preference.PreferenceFragmentCompat -import androidx.preference.SwitchPreference -import org.mozilla.fenix.R -import org.mozilla.fenix.ext.components -import org.mozilla.fenix.ext.settings -import org.mozilla.fenix.ext.showToolbar - -/** - * Lets the user customize remote improvements (rollouts) settings. - */ -class RemoteImprovementsFragment : PreferenceFragmentCompat() { - - override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { - setPreferencesFromResource(R.xml.remote_improvements_preferences, rootKey) - - requirePreference<SwitchPreference>(R.string.pref_key_rollouts).apply { - isChecked = context.settings().isRolloutsEnabled - onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue -> - val enabled = newValue as? Boolean ?: false - context.settings().isRolloutsEnabled = enabled - context.components.nimbus.sdk.rolloutParticipation = enabled - true - } - } - - requirePreference<Preference>(R.string.pref_key_rollouts_learn_more).apply { - onPreferenceClickListener = Preference.OnPreferenceClickListener { - SupportUtils.launchSandboxCustomTab( - context = requireContext(), - url = SupportUtils.getSumoURLForTopic( - context = requireContext(), - topic = SupportUtils.SumoTopic.REMOTE_IMPROVEMENTS, - ), - ) - true - } - } - } - - override fun onResume() { - super.onResume() - showToolbar(getString(R.string.preferences_remote_improvements)) - } -} diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt @@ -480,10 +480,6 @@ class SettingsFragment : PreferenceFragmentCompat() { SettingsFragmentDirections.actionSettingsFragmentToLinkSharingFragment() } - resources.getString(R.string.pref_key_remote_improvements) -> { - SettingsFragmentDirections.actionSettingsFragmentToRemoteImprovementsFragment() - } - resources.getString(R.string.pref_key_open_links_in_apps) -> { SettingsFragmentDirections.actionSettingsFragmentToOpenLinksInAppsFragment() } diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt @@ -42,7 +42,6 @@ object SupportUtils { TRACKING_PROTECTION("tracking-protection-firefox-android"), TOTAL_COOKIE_PROTECTION("enhanced-tracking-protection-android"), OPT_OUT_STUDIES("how-opt-out-studies-firefox-android"), - REMOTE_IMPROVEMENTS("remote-improvements"), SEND_TABS("send-tab-preview"), SET_AS_DEFAULT_BROWSER("make-firefox-default-browser-android"), SEARCH_SUGGESTION("how-search-firefox-preview"), diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/datachoices/DataChoicesMiddleware.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/datachoices/DataChoicesMiddleware.kt @@ -104,13 +104,17 @@ internal class DataChoicesMiddleware( metrics.start(MetricServiceType.Data) if (!settings.hasUserDisabledExperimentation) { settings.isExperimentationEnabled = true - nimbusSdk.experimentParticipation = true } + // Use separate participation flags for experiments and rollouts + nimbusSdk.experimentParticipation = true + nimbusSdk.rolloutParticipation = true engine.notifyTelemetryPrefChanged(true) } else { metrics.stop(MetricServiceType.Data) settings.isExperimentationEnabled = false + // Use separate participation flags for experiments and rollouts nimbusSdk.experimentParticipation = false + nimbusSdk.rolloutParticipation = false engine.notifyTelemetryPrefChanged(false) } // Reset experiment identifiers on both opt-in and opt-out; it's likely diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/datachoices/DataChoicesScreen.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/datachoices/DataChoicesScreen.kt @@ -271,7 +271,7 @@ private fun TogglePreferenceSection( } /** - * Composable section that displays the user's participation status in studies or experiments. + * Composable section that displays the user’s participation status in studies or experiments. * * @param studiesEnabled Whether the user is currently enrolled in studies. * Affects the summary text shown in the section. @@ -296,7 +296,7 @@ private fun StudiesSection( ) TextListItem( - label = stringResource(R.string.studies_title_2), + label = stringResource(R.string.studies_title), description = stringResource(if (studiesEnabled) R.string.studies_on else R.string.studies_off), enabled = sectionEnabled, onClick = onClick, diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/studies/StudiesView.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/studies/StudiesView.kt @@ -65,6 +65,7 @@ class StudiesView( // Use experimentParticipation for studies-specific settings experiments.experimentParticipation = isChecked + experiments.rolloutParticipation = isChecked } bindDescription() @@ -94,7 +95,7 @@ class StudiesView( @VisibleForTesting internal fun bindDescription() { val sumoUrl = SupportUtils.getGenericSumoURLForTopic(OPT_OUT_STUDIES) - val description = context.getString(R.string.studies_description_4) + val description = context.getString(R.string.studies_description_3) val learnMore = context.getString(R.string.studies_learn_more) val rawText = "$description <a href=\"$sumoUrl\">$learnMore</a>" val text = HtmlCompat.fromHtml(rawText, HtmlCompat.FROM_HTML_MODE_COMPACT) 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 @@ -709,16 +709,6 @@ class Settings( default = false, ) - /** - * Controls whether the user is opted into rollouts (remote improvements). - * Rollouts are completely decoupled from telemetry and experiments, so users - * can receive feature updates regardless of their telemetry or experiment settings. - */ - var isRolloutsEnabled by booleanPreference( - appContext.getPreferenceKey(R.string.pref_key_rollouts), - default = appContext.components.nimbus.sdk.rolloutParticipation, - ) - var isOverrideTPPopupsForPerformanceTest = false // We do not use `booleanPreference` because we only want the "read" part of this setting to be diff --git a/mobile/android/fenix/app/src/main/res/navigation/nav_graph.xml b/mobile/android/fenix/app/src/main/res/navigation/nav_graph.xml @@ -770,13 +770,6 @@ app:popEnterAnim="@anim/slide_in_left" app:popExitAnim="@anim/slide_out_right" /> <action - android:id="@+id/action_settingsFragment_to_remoteImprovementsFragment" - app:destination="@id/remoteImprovementsFragment" - app:enterAnim="@anim/slide_in_right" - app:exitAnim="@anim/slide_out_left" - app:popEnterAnim="@anim/slide_in_left" - app:popExitAnim="@anim/slide_out_right" /> - <action android:id="@+id/action_settingsFragment_to_tabsSettingsFragment" app:destination="@id/tabsSettingsFragment" app:enterAnim="@anim/slide_in_right" @@ -1082,9 +1075,6 @@ android:id="@+id/linkSharingFragment" android:name="org.mozilla.fenix.settings.LinkSharingFragment" /> <fragment - android:id="@+id/remoteImprovementsFragment" - android:name="org.mozilla.fenix.settings.RemoteImprovementsFragment" /> - <fragment android:id="@+id/deleteBrowsingDataFragment" android:name="org.mozilla.fenix.settings.deletebrowsingdata.DeleteBrowsingDataFragment" android:label="@string/preferences_delete_browsing_data" diff --git a/mobile/android/fenix/app/src/main/res/values/preference_keys.xml b/mobile/android/fenix/app/src/main/res/values/preference_keys.xml @@ -61,11 +61,8 @@ <string name="pref_key_private_browsing" translatable="false">pref_key_private_browsing</string> <string name="pref_key_leakcanary" translatable="false">pref_key_leakcanary</string> <string name="pref_key_remote_debugging" translatable="false">pref_key_remote_debugging</string> - <string name="pref_key_remote_improvements" translatable="false">pref_key_remote_improvements</string> <string name="pref_key_crash_reporting_choice" translatable="false">pref_key_crash_reporting_choice</string> <string name="pref_key_experimentation_v2" translatable="false">pref_key_experimentation_v2</string> - <string name="pref_key_rollouts" translatable="false">pref_key_rollouts</string> - <string name="pref_key_rollouts_learn_more" translatable="false">pref_key_rollouts_learn_more</string> <string name="pref_key_user_disabled_experimentation" translatable="false">pref_key_user_disabled_experimentation</string> <string name="pref_key_private_mode_opened" translatable="false">pref_key_private_mode_opened</string> <string name="pref_key_open_in_app_opened" translatable="false">pref_key_open_in_app_opened</string> diff --git a/mobile/android/fenix/app/src/main/res/values/strings.xml b/mobile/android/fenix/app/src/main/res/values/strings.xml @@ -1394,26 +1394,12 @@ <!-- Title of the active section on the studies list --> <string name="studies_active">Active</string> <!-- Description for studies --> - <string name="studies_description_3" moz:removedIn="148" tools:ignore="UnusedResources">Try out features and ideas before they’re released to everyone.</string> - <!-- Description for studies. Note: The word "Firefox" should NOT be translated --> - <string name="studies_description_4" tools:ignore="BrandUsage">Firefox randomly selects users to test features, which improves quality for everyone.</string> + <string name="studies_description_3">Try out features and ideas before they’re released to everyone.</string> <!-- Title of the Studies data preference --> - <string name="studies_title" moz:removedIn="148" tools:ignore="UnusedResources">Install and run studies</string> - <!-- Title of the Studies data preference --> - <string name="studies_title_2">Allow feature studies</string> + <string name="studies_title">Install and run studies</string> <!-- Learn more link for studies, links to an article for more information about studies. --> <string name="studies_learn_more">Learn more</string> - <!-- Remote Improvements (Rollouts) --> - <!-- Title of the Remote Improvements (rollouts) data preference --> - <string name="remote_improvements_title">Allow remote improvements</string> - <!-- Description for remote improvements. Note: The word "Firefox" should NOT be translated --> - <string name="remote_improvements_description" tools:ignore="BrandUsage">Firefox will improve features, performance, and stability between updates. Changes applied remotely.</string> - <!-- Learn more link for remote improvements, links to an article for more information about rollouts. --> - <string name="remote_improvements_learn_more">Learn more</string> - <!-- Title for remote improvements preference in Advanced settings --> - <string name="preferences_remote_improvements">Remote improvements</string> - <!-- Sessions --> <!-- Title for the list of tabs in the current normal session used by a11y services The %1$s will be replaced by the number of opened normal tabs --> diff --git a/mobile/android/fenix/app/src/main/res/xml/preferences.xml b/mobile/android/fenix/app/src/main/res/xml/preferences.xml @@ -195,11 +195,6 @@ app:iconSpaceReserved="false" app:isPreferenceVisible="@bool/IS_DEBUG" /> - <androidx.preference.Preference - android:key="@string/pref_key_remote_improvements" - android:title="@string/preferences_remote_improvements" - app:iconSpaceReserved="false" /> - <androidx.preference.SwitchPreference android:key="@string/pref_key_remote_debugging" android:title="@string/preferences_remote_debugging" diff --git a/mobile/android/fenix/app/src/main/res/xml/remote_improvements_preferences.xml b/mobile/android/fenix/app/src/main/res/xml/remote_improvements_preferences.xml @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- This Source Code Form is subject to the terms of the Mozilla Public - - License, v. 2.0. If a copy of the MPL was not distributed with this - - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<androidx.preference.PreferenceScreen - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> - <SwitchPreference - android:defaultValue="true" - android:key="@string/pref_key_rollouts" - android:title="@string/remote_improvements_title" - android:summary="@string/remote_improvements_description" - app:iconSpaceReserved="false" /> - <Preference - android:key="@string/pref_key_rollouts_learn_more" - android:title="@string/remote_improvements_learn_more" - app:iconSpaceReserved="false" /> -</androidx.preference.PreferenceScreen> diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/FenixApplicationTest.kt @@ -81,7 +81,6 @@ class FenixApplicationTest { browserStore = BrowserStore() every { testContext.components.core } returns mockk(relaxed = true) - every { testContext.components.nimbus } returns mockk(relaxed = true) every { testContext.components.distributionIdManager } returns DistributionIdManager( packageManager = testContext.packageManagerWrapper, browserStoreProvider = DefaultDistributionBrowserStoreProvider(browserStore), diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/DefaultHomepageAsANewTabPreferenceRepositoryTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/DefaultHomepageAsANewTabPreferenceRepositoryTest.kt @@ -5,25 +5,16 @@ package org.mozilla.fenix.components import androidx.test.ext.junit.runners.AndroidJUnit4 -import io.mockk.every -import io.mockk.mockk import junit.framework.TestCase.assertFalse import junit.framework.TestCase.assertTrue import mozilla.components.support.test.robolectric.testContext -import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.ext.components import org.mozilla.fenix.utils.Settings @RunWith(AndroidJUnit4::class) class DefaultHomepageAsANewTabPreferenceRepositoryTest { - @Before - fun setup() { - every { testContext.components.nimbus } returns mockk(relaxed = true) - } - @Test fun `WHEN homepage as a new tab enabled getter is called THEN return the value in shared preferences`() { val settings = Settings(testContext) diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/StartupMiddlewareTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/StartupMiddlewareTest.kt @@ -32,8 +32,6 @@ class StartupMiddlewareTest { @Before fun setup() { - every { testContext.components.nimbus } returns mockk(relaxed = true) - useCases = mockk(relaxed = true) settings = Settings(testContext) repository = DefaultHomepageAsANewTabPreferenceRepository(settings) diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/menu/MenuDialogMiddlewareTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/menu/MenuDialogMiddlewareTest.kt @@ -8,8 +8,6 @@ import android.app.PendingIntent import android.content.Intent import androidx.appcompat.app.AlertDialog import com.google.android.material.dialog.MaterialAlertDialogBuilder -import io.mockk.every -import io.mockk.mockk import kotlinx.coroutines.runBlocking import mozilla.appservices.places.BookmarkRoot import mozilla.components.browser.state.state.ReaderState @@ -59,7 +57,6 @@ import org.mozilla.fenix.components.menu.store.BrowserMenuState import org.mozilla.fenix.components.menu.store.MenuAction import org.mozilla.fenix.components.menu.store.MenuState import org.mozilla.fenix.components.menu.store.MenuStore -import org.mozilla.fenix.ext.components import org.mozilla.fenix.utils.LastSavedFolderCache import org.mozilla.fenix.utils.Settings import org.robolectric.RobolectricTestRunner @@ -95,8 +92,6 @@ class MenuDialogMiddlewareTest { @Before fun setup() { - every { testContext.components.nimbus } returns mockk(relaxed = true) - alertDialogBuilder = mock() pinnedSiteStorage = mock() addPinnedSiteUseCase = mock() diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/metrics/AdjustMetricsServiceTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/metrics/AdjustMetricsServiceTest.kt @@ -7,26 +7,16 @@ package org.mozilla.fenix.components.metrics import android.content.Context import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 -import io.mockk.every -import io.mockk.mockk -import mozilla.components.support.test.robolectric.testContext import org.junit.Assert.assertFalse import org.junit.Assert.assertTrue -import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import org.mozilla.fenix.ext.components import org.mozilla.fenix.utils.Settings @RunWith(AndroidJUnit4::class) internal class AdjustMetricsServiceTest { val context: Context = ApplicationProvider.getApplicationContext() - @Before - fun setup() { - every { testContext.components.nimbus } returns mockk(relaxed = true) - } - @Test fun `WHEN Adjust attribution data already exist THEN already known is true`() { val settings = Settings(context) diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/metrics/InstallReferrerMetricsServiceTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/components/metrics/InstallReferrerMetricsServiceTest.kt @@ -6,20 +6,16 @@ package org.mozilla.fenix.components.metrics import android.content.Context import androidx.test.core.app.ApplicationProvider -import io.mockk.every -import io.mockk.mockk import mozilla.components.support.test.robolectric.testContext import org.junit.Assert.assertEquals import org.junit.Assert.assertFalse import org.junit.Assert.assertNull import org.junit.Assert.assertTrue -import org.junit.Before import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.GleanMetrics.MetaAttribution import org.mozilla.fenix.GleanMetrics.PlayStoreAttribution -import org.mozilla.fenix.ext.components import org.mozilla.fenix.helpers.FenixGleanTestRule import org.mozilla.fenix.utils.Settings import org.robolectric.RobolectricTestRunner @@ -31,11 +27,6 @@ internal class InstallReferrerMetricsServiceTest { @get:Rule val gleanTestRule = FenixGleanTestRule(testContext) - @Before - fun setup() { - every { testContext.components.nimbus } returns mockk(relaxed = true) - } - @Test fun `WHEN retrieving minimum UTM params from setting THEN result should match`() { val settings = Settings(context) diff --git a/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt b/mobile/android/fenix/app/src/test/java/org/mozilla/fenix/utils/SettingsTest.kt @@ -7,7 +7,6 @@ package org.mozilla.fenix.utils import android.content.pm.PackageInfo import androidx.core.content.edit import io.mockk.every -import io.mockk.mockk import io.mockk.spyk import mozilla.components.concept.engine.Engine.HttpsOnlyMode.DISABLED import mozilla.components.concept.engine.Engine.HttpsOnlyMode.ENABLED @@ -27,7 +26,6 @@ import org.junit.Test import org.junit.runner.RunWith import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.components.toolbar.ToolbarPosition -import org.mozilla.fenix.ext.components import org.mozilla.fenix.nimbus.DefaultBrowserPrompt import org.mozilla.fenix.nimbus.FakeNimbusEventStore import org.mozilla.fenix.settings.PhoneFeature @@ -59,7 +57,6 @@ class SettingsTest { @Before fun setUp() { - every { testContext.components.nimbus } returns mockk(relaxed = true) settings = Settings(testContext) }