diff --git a/app/metrics.yaml b/app/metrics.yaml index 6d2d270e1..62d81c23d 100644 --- a/app/metrics.yaml +++ b/app/metrics.yaml @@ -733,53 +733,6 @@ login_dialog: - android-probes@mozilla.com expires: "2022-02-01" -find_in_page: - opened: - type: event - description: | - A user opened the find in page UI - bugs: - - https://github.com/mozilla-mobile/fenix/issues/1036 - data_reviews: - - https://github.com/mozilla-mobile/fenix/pull/1344#issuecomment-479285010 - - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068 - - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789 - data_sensitivity: - - interaction - notification_emails: - - android-probes@mozilla.com - expires: "2021-08-01" - closed: - type: event - description: | - A user closed the find in page UI - bugs: - - https://github.com/mozilla-mobile/fenix/issues/1036 - data_reviews: - - https://github.com/mozilla-mobile/fenix/pull/1344#issuecomment-479285010 - - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068 - - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789 - data_sensitivity: - - interaction - notification_emails: - - android-probes@mozilla.com - expires: "2021-08-01" - searched_page: - type: event - description: | - A user searched the page - bugs: - - https://github.com/mozilla-mobile/fenix/issues/1036 - data_reviews: - - https://github.com/mozilla-mobile/fenix/pull/1344#issuecomment-479285010 - - https://github.com/mozilla-mobile/fenix/pull/15713#issuecomment-703972068 - - https://github.com/mozilla-mobile/fenix/pull/19924#issuecomment-861423789 - data_sensitivity: - - interaction - notification_emails: - - android-probes@mozilla.com - expires: "2021-08-01" - metrics: default_browser: type: boolean 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 97a5b6c84..3015d39e0 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 @@ -96,9 +96,6 @@ sealed class Event { object CollectionRenamePressed : Event() object SearchWidgetNewTabPressed : Event() object SearchWidgetVoiceSearchPressed : Event() - object FindInPageOpened : Event() - object FindInPageClosed : Event() - object FindInPageSearchCommitted : Event() object PrivateBrowsingSnackbarUndoTapped : Event() object PrivateBrowsingNotificationTapped : Event() object PrivateBrowsingCreateShortcut : 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 f50770413..24c8e9b50 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 @@ -25,7 +25,6 @@ import org.mozilla.fenix.GleanMetrics.CustomTab import org.mozilla.fenix.GleanMetrics.ErrorPage import org.mozilla.fenix.GleanMetrics.Events import org.mozilla.fenix.GleanMetrics.ExperimentsDefaultBrowser -import org.mozilla.fenix.GleanMetrics.FindInPage import org.mozilla.fenix.GleanMetrics.History import org.mozilla.fenix.GleanMetrics.HomeMenu import org.mozilla.fenix.GleanMetrics.HomeScreen @@ -156,15 +155,6 @@ private val Event.wrapper: EventWrapper<*>? is Event.LoginDialogPromptNeverSave -> EventWrapper( { LoginDialog.neverSave.record(it) } ) - is Event.FindInPageOpened -> EventWrapper( - { FindInPage.opened.record(it) } - ) - is Event.FindInPageClosed -> EventWrapper( - { FindInPage.closed.record(it) } - ) - is Event.FindInPageSearchCommitted -> EventWrapper( - { FindInPage.searchedPage.record(it) } - ) is Event.ContextMenuItemTapped -> EventWrapper( { ContextMenu.itemTapped.record(it) }, { ContextMenu.itemTappedKeys.valueOf(it) } diff --git a/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt b/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt index 30d16ca9a..23fe9a5c1 100644 --- a/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt +++ b/app/src/main/java/org/mozilla/fenix/components/metrics/MetricController.kt @@ -18,7 +18,6 @@ import mozilla.components.feature.awesomebar.provider.SearchSuggestionProvider import mozilla.components.feature.awesomebar.provider.SessionSuggestionProvider import mozilla.components.feature.contextmenu.facts.ContextMenuFacts import mozilla.components.feature.customtabs.CustomTabsFacts -import mozilla.components.feature.findinpage.facts.FindInPageFacts import mozilla.components.feature.media.facts.MediaFacts import mozilla.components.feature.prompts.dialog.LoginDialogFacts import mozilla.components.feature.pwa.ProgressiveWebAppFacts @@ -164,8 +163,6 @@ internal class ReleaseMetricController( Component.FEATURE_PROMPTS to LoginDialogFacts.Items.NEVER_SAVE -> Event.LoginDialogPromptNeverSave Component.FEATURE_PROMPTS to LoginDialogFacts.Items.SAVE -> Event.LoginDialogPromptSave - Component.FEATURE_FINDINPAGE to FindInPageFacts.Items.CLOSE -> Event.FindInPageClosed - Component.FEATURE_FINDINPAGE to FindInPageFacts.Items.INPUT -> Event.FindInPageSearchCommitted Component.FEATURE_CONTEXTMENU to ContextMenuFacts.Items.ITEM -> { metadata?.get("item")?.let { Event.ContextMenuItemTapped.create(it.toString()) } } diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt index 4b3c3db88..aec201d84 100644 --- a/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt +++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt @@ -297,7 +297,6 @@ class DefaultBrowserToolbarMenuController( } is ToolbarMenu.Item.FindInPage -> { findInPageLauncher() - metrics.track(Event.FindInPageOpened) } is ToolbarMenu.Item.AddonsManager -> browserAnimator.captureEngineViewAndDrawStatically { navController.nav( diff --git a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarMenuControllerTest.kt b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarMenuControllerTest.kt index 977950d6f..de3e419c8 100644 --- a/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarMenuControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/components/toolbar/DefaultBrowserToolbarMenuControllerTest.kt @@ -509,7 +509,6 @@ class DefaultBrowserToolbarMenuControllerTest { controller.handleToolbarItemInteraction(item) assertTrue(launcherInvoked) - verify { metrics.track(Event.FindInPageOpened) } } @Test