For #24708 - Remove Event.wrapper for DarkThemeSelected telemetry

app/metrics.yaml

@@ -5289,6 +5289,7 @@ app_theme:
       A user selected Dark Theme
     extra_keys:
       source:
+        type: string
         description: |
           The source from where dark theme was selected. The source can be
           'SETTINGS' or 'ONBOARDING'

app/src/main/java/org/mozilla/fenix/components/metrics/Event.kt

@@ -7,7 +7,6 @@ package org.mozilla.fenix.components.metrics
 import mozilla.components.browser.state.search.SearchEngine
 import mozilla.components.feature.top.sites.TopSite
 import org.mozilla.fenix.GleanMetrics.Addons
-import org.mozilla.fenix.GleanMetrics.AppTheme
 import org.mozilla.fenix.GleanMetrics.Autoplay
 import org.mozilla.fenix.GleanMetrics.ContextMenu
 import org.mozilla.fenix.GleanMetrics.Events
@@ -246,13 +245,6 @@ sealed class Event {
             get() = mapOf(Events.performedSearchKeys.source to eventSource.sourceLabel)
     }
 
-    data class DarkThemeSelected(val source: Source) : Event() {
-        enum class Source { SETTINGS }
-
-        override val extras: Map<AppTheme.darkThemeSelectedKeys, String>?
-            get() = mapOf(AppTheme.darkThemeSelectedKeys.source to source.name)
-    }
-
     data class SearchWithAds(val providerName: String) : Event() {
         val label: String
             get() = providerName

app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt

@@ -10,7 +10,6 @@ import mozilla.components.service.glean.private.NoExtraKeys
 import mozilla.components.support.base.log.logger.Logger
 import org.mozilla.fenix.GleanMetrics.Addons
 import org.mozilla.fenix.GleanMetrics.AndroidAutofill
-import org.mozilla.fenix.GleanMetrics.AppTheme
 import org.mozilla.fenix.GleanMetrics.Autoplay
 import org.mozilla.fenix.GleanMetrics.Awesomebar
 import org.mozilla.fenix.GleanMetrics.BrowserSearch
@@ -220,10 +219,6 @@ private val Event.wrapper: EventWrapper<*>?
             { Pocket.homeRecsCategoryClicked.record(it) },
             { Pocket.homeRecsCategoryClickedKeys.valueOf(it) }
         )
-        is Event.DarkThemeSelected -> EventWrapper(
-            { AppTheme.darkThemeSelected.record(it) },
-            { AppTheme.darkThemeSelectedKeys.valueOf(it) }
-        )
         is Event.AddonsOpenInSettings -> EventWrapper<NoExtraKeys>(
             { Addons.openAddonsInSettings.record(it) }
         )

app/src/main/java/org/mozilla/fenix/settings/CustomizationFragment.kt

@@ -12,11 +12,10 @@ import androidx.appcompat.app.AppCompatDelegate
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.SwitchPreference
 import org.mozilla.fenix.FeatureFlags
+import org.mozilla.fenix.GleanMetrics.AppTheme
 import org.mozilla.fenix.GleanMetrics.ToolbarSettings
 import org.mozilla.fenix.R
-import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.components.toolbar.ToolbarPosition
-import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.requireComponents
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.ext.showToolbar
@@ -85,9 +84,9 @@ class CustomizationFragment : PreferenceFragmentCompat() {
     private fun bindDarkTheme() {
         radioDarkTheme = requirePreference(R.string.pref_key_dark_theme)
         radioDarkTheme.onClickListener {
-            requireContext().components.analytics.metrics.track(
-                Event.DarkThemeSelected(
-                    Event.DarkThemeSelected.Source.SETTINGS
+            AppTheme.darkThemeSelected.record(
+                AppTheme.DarkThemeSelectedExtra(
+                    "SETTINGS"
                 )
             )
             setNewTheme(AppCompatDelegate.MODE_NIGHT_YES)