diff --git a/app/metrics.yaml b/app/metrics.yaml index e49f81979..45019e78f 100644 --- a/app/metrics.yaml +++ b/app/metrics.yaml @@ -3715,6 +3715,32 @@ top_sites: notification_emails: - android-probes@mozilla.com expires: "2022-02-01" + google_top_site_removed: + type: event + description: | + A user removed the default Google top site + bugs: + - https://github.com/mozilla-mobile/fenix/issues/21841 + data_reviews: + - https://github.com/mozilla-mobile/fenix/pull/21845#issuecomment-944608568 + data_sensitivity: + - interaction + notification_emails: + - android-probes@mozilla.com + expires: "2022-02-01" + baidu_top_site_removed: + type: event + description: | + A user removed the default Baidu top site + bugs: + - https://github.com/mozilla-mobile/fenix/issues/21841 + data_reviews: + - https://github.com/mozilla-mobile/fenix/pull/21845#issuecomment-944608568 + data_sensitivity: + - interaction + notification_emails: + - android-probes@mozilla.com + expires: "2022-02-01" app_theme: dark_theme_selected: diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/Event.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/Event.kt index f01bf18c8..96a3a9adf 100644 --- a/app/src/main/java/org/mozilla/fenix/components/metrics/Event.kt +++ b/app/src/main/java/org/mozilla/fenix/components/metrics/Event.kt @@ -113,6 +113,8 @@ sealed class Event { object TopSiteOpenInNewTab : Event() object TopSiteOpenInPrivateTab : Event() object TopSiteRemoved : Event() + object GoogleTopSiteRemoved : Event() + object BaiduTopSiteRemoved : Event() object TrackingProtectionTrackerList : Event() object TrackingProtectionIconPressed : Event() object TrackingProtectionSettingsPanel : Event() diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt index f28c97e4f..91267ab83 100644 --- a/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt +++ b/app/src/main/java/org/mozilla/fenix/components/metrics/GleanMetricsService.kt @@ -479,6 +479,12 @@ private val Event.wrapper: EventWrapper<*>? is Event.TopSiteRemoved -> EventWrapper( { TopSites.remove.record(it) } ) + is Event.GoogleTopSiteRemoved -> EventWrapper( + { TopSites.googleTopSiteRemoved.record(it) } + ) + is Event.BaiduTopSiteRemoved -> EventWrapper( + { TopSites.baiduTopSiteRemoved.record(it) } + ) is Event.TopSiteLongPress -> EventWrapper( { TopSites.longPress.record(it) }, { TopSites.longPressKeys.valueOf(it) } diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt index edbb31bc5..0028195a0 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt @@ -347,8 +347,10 @@ class DefaultSessionControlController( override fun handleRemoveTopSiteClicked(topSite: TopSite) { metrics.track(Event.TopSiteRemoved) - if (topSite.url == SupportUtils.POCKET_TRENDING_URL) { - metrics.track(Event.PocketTopSiteRemoved) + when (topSite.url) { + SupportUtils.POCKET_TRENDING_URL -> metrics.track(Event.PocketTopSiteRemoved) + SupportUtils.GOOGLE_URL -> metrics.track(Event.GoogleTopSiteRemoved) + SupportUtils.BAIDU_URL -> metrics.track(Event.BaiduTopSiteRemoved) } viewLifecycleScope.launch(Dispatchers.IO) {