Remove private browsing shortcut telemetry

app/metrics.yaml

@@ -3081,103 +3081,6 @@ tracking_protection:
       - android-probes@mozilla.com
     expires: "2022-02-01"
 
-private_browsing_shortcut:
-  create_shortcut:
-    type: event
-    description: |
-      A user pressed the "Add private browsing shortcut" button in settings.
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/4658
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/5194
-      - 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"
-  cfr_add_shortcut:
-    type: event
-    description: |
-      A user pressed the "Add shortcut" button when the contextual feature
-      recommender appeared.
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/4658
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/5194
-      - 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"
-  cfr_cancel:
-    type: event
-    description: |
-      A user pressed the "No thanks" button when the contextual feature
-      recommender appeared.
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/4658
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/5194
-      - 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"
-  pinned_shortcut_priv:
-    type: event
-    description: |
-      A user pressed the pinned private shortcut in Android home screen, opening
-      up a new private search.
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/4658
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/5194
-      - 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"
-  static_shortcut_tab:
-    type: event
-    description: |
-      A user pressed the long-press shortcut "Open new tab", opening up a new
-      search.
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/4658
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/5194
-      - 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"
-  static_shortcut_priv:
-    type: event
-    description: |
-      A user pressed the long-press shortcut "Open new private tab", opening up
-      a new private search.
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/4658
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/5194
-      - 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"
-
 tab:
   media_play:
     type: event

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

@@ -95,12 +95,6 @@ sealed class Event {
     object CollectionRenamePressed : Event()
     object SearchWidgetNewTabPressed : Event()
     object SearchWidgetVoiceSearchPressed : Event()
-    object PrivateBrowsingCreateShortcut : Event()
-    object PrivateBrowsingAddShortcutCFR : Event()
-    object PrivateBrowsingCancelCFR : Event()
-    object PrivateBrowsingPinnedShortcutPrivateTab : Event()
-    object PrivateBrowsingStaticShortcutTab : Event()
-    object PrivateBrowsingStaticShortcutPrivateTab : Event()
     object TabMediaPlay : Event()
     object TabMediaPause : Event()
     object MediaPlayState : Event()

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

@@ -36,7 +36,6 @@ import org.mozilla.fenix.GleanMetrics.Metrics
 import org.mozilla.fenix.GleanMetrics.Onboarding
 import org.mozilla.fenix.GleanMetrics.Pings
 import org.mozilla.fenix.GleanMetrics.Pocket
-import org.mozilla.fenix.GleanMetrics.PrivateBrowsingShortcut
 import org.mozilla.fenix.GleanMetrics.ProgressiveWebApp
 import org.mozilla.fenix.GleanMetrics.ReaderMode
 import org.mozilla.fenix.GleanMetrics.RecentBookmarks
@@ -371,24 +370,6 @@ private val Event.wrapper: EventWrapper<*>?
         is Event.SearchWidgetVoiceSearchPressed -> EventWrapper<NoExtraKeys>(
             { SearchWidget.voiceButton.record(it) }
         )
-        is Event.PrivateBrowsingCreateShortcut -> EventWrapper<NoExtraKeys>(
-            { PrivateBrowsingShortcut.createShortcut.record(it) }
-        )
-        is Event.PrivateBrowsingAddShortcutCFR -> EventWrapper<NoExtraKeys>(
-            { PrivateBrowsingShortcut.cfrAddShortcut.record(it) }
-        )
-        is Event.PrivateBrowsingCancelCFR -> EventWrapper<NoExtraKeys>(
-            { PrivateBrowsingShortcut.cfrCancel.record(it) }
-        )
-        is Event.PrivateBrowsingPinnedShortcutPrivateTab -> EventWrapper<NoExtraKeys>(
-            { PrivateBrowsingShortcut.pinnedShortcutPriv.record(it) }
-        )
-        is Event.PrivateBrowsingStaticShortcutTab -> EventWrapper<NoExtraKeys>(
-            { PrivateBrowsingShortcut.staticShortcutTab.record(it) }
-        )
-        is Event.PrivateBrowsingStaticShortcutPrivateTab -> EventWrapper<NoExtraKeys>(
-            { PrivateBrowsingShortcut.staticShortcutPriv.record(it) }
-        )
         is Event.WhatsNewTapped -> EventWrapper<NoExtraKeys>(
             { Events.whatsNewTapped.record(it) }
         )

app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt

@@ -776,14 +776,12 @@ class HomeFragment : Fragment() {
                 )
             layout.findViewById<Button>(R.id.cfr_pos_button).apply {
                 setOnClickListener {
-                    context.metrics.track(Event.PrivateBrowsingAddShortcutCFR)
                     PrivateShortcutCreateManager.createPrivateShortcut(context)
                     privateBrowsingRecommend.dismiss()
                 }
             }
             layout.findViewById<Button>(R.id.cfr_neg_button).apply {
                 setOnClickListener {
-                    context.metrics.track(Event.PrivateBrowsingCancelCFR)
                     privateBrowsingRecommend.dismiss()
                 }
             }

app/src/main/java/org/mozilla/fenix/home/intent/StartSearchIntentProcessor.kt

@@ -30,16 +30,9 @@ class StartSearchIntentProcessor(
                     metrics.track(Event.SearchWidgetNewTabPressed)
                     Event.PerformedSearch.SearchAccessPoint.WIDGET
                 }
-                STATIC_SHORTCUT_NEW_TAB -> {
-                    metrics.track(Event.PrivateBrowsingStaticShortcutTab)
-                    Event.PerformedSearch.SearchAccessPoint.SHORTCUT
-                }
-                STATIC_SHORTCUT_NEW_PRIVATE_TAB -> {
-                    metrics.track(Event.PrivateBrowsingStaticShortcutPrivateTab)
-                    Event.PerformedSearch.SearchAccessPoint.SHORTCUT
-                }
+                STATIC_SHORTCUT_NEW_TAB,
+                STATIC_SHORTCUT_NEW_PRIVATE_TAB,
                 PRIVATE_BROWSING_PINNED_SHORTCUT -> {
-                    metrics.track(Event.PrivateBrowsingPinnedShortcutPrivateTab)
                     Event.PerformedSearch.SearchAccessPoint.SHORTCUT
                 }
                 else -> null

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

@@ -12,8 +12,6 @@ import androidx.preference.SwitchPreference
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
 import org.mozilla.fenix.components.PrivateShortcutCreateManager
-import org.mozilla.fenix.components.metrics.Event
-import org.mozilla.fenix.ext.metrics
 import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.ext.showToolbar
 
@@ -34,7 +32,6 @@ class PrivateBrowsingFragment : PreferenceFragmentCompat() {
     private fun updatePreferences() {
         requirePreference<Preference>(R.string.pref_key_add_private_browsing_shortcut).apply {
             setOnPreferenceClickListener {
-                requireContext().metrics.track(Event.PrivateBrowsingCreateShortcut)
                 PrivateShortcutCreateManager.createPrivateShortcut(requireContext())
                 true
             }

app/src/test/java/org/mozilla/fenix/home/HomeFragmentTest.kt

@@ -17,7 +17,6 @@ import org.junit.Test
 import org.mozilla.fenix.FenixApplication
 import org.mozilla.fenix.ext.application
 import org.mozilla.fenix.ext.components
-import org.mozilla.fenix.ext.settings
 import org.mozilla.fenix.utils.Settings
 
 @ExperimentalCoroutinesApi