For #10343: Updates metrics accordingly to 'Library' removal

app/metrics.yaml

@@ -89,10 +89,10 @@ events:
           A string containing the name of the item the user tapped. These items
           include:
 
-            Settings, Library, Help, Desktop Site toggle on/off, Find in Page,
+            Settings, Help, Desktop Site toggle on/off, Find in Page,
             New Tab, Private Tab, Share, Report Site Issue, Back/Forward button,
             Reload Button, Quit, Reader Mode On, Reader Mode Off, Open In app,
-            Add To Top Sites, Add-ons Manager
+            Add To Top Sites, Add-ons Manager, Bookmarks, History
     bugs:
       - https://github.com/mozilla-mobile/fenix/issues/1024
     data_reviews:
@@ -808,44 +808,6 @@ qr_scanner:
       - fenix-core@mozilla.com
     expires: "2020-09-01"
 
-library:
-  opened:
-    type: event
-    description: |
-      A user opened the library
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/976
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/2538#issuecomment-492830242
-    notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2020-09-01"
-  closed:
-    type: event
-    description: |
-      A user closed the library
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/976
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/2538#issuecomment-492830242
-    notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2020-09-01"
-  selected_item:
-    type: event
-    description: |
-      A user selected a library item
-    extra_keys:
-      item:
-        description: "The library item the user selected"
-    bugs:
-      - https://github.com/mozilla-mobile/fenix/issues/976
-    data_reviews:
-      - https://github.com/mozilla-mobile/fenix/pull/2538#issuecomment-492830242
-    notification_emails:
-      - fenix-core@mozilla.com
-    expires: "2020-09-01"
-
 error_page:
   visited_error:
     type: event

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

@@ -22,7 +22,6 @@ import org.mozilla.fenix.GleanMetrics.ErrorPage
 import org.mozilla.fenix.GleanMetrics.Events
 import org.mozilla.fenix.GleanMetrics.FindInPage
 import org.mozilla.fenix.GleanMetrics.History
-import org.mozilla.fenix.GleanMetrics.Library
 import org.mozilla.fenix.GleanMetrics.Logins
 import org.mozilla.fenix.GleanMetrics.MediaNotification
 import org.mozilla.fenix.GleanMetrics.MediaState
@@ -213,16 +212,6 @@ private val Event.wrapper: EventWrapper<*>?
         is Event.QRScannerNavigationDenied -> EventWrapper<NoExtraKeys>(
             { QrScanner.navigationDenied.record(it) }
         )
-        is Event.LibraryOpened -> EventWrapper<NoExtraKeys>(
-            { Library.opened.record(it) }
-        )
-        is Event.LibraryClosed -> EventWrapper<NoExtraKeys>(
-            { Library.closed.record(it) }
-        )
-        is Event.LibrarySelectedItem -> EventWrapper(
-            { Library.selectedItem.record(it) },
-            { Library.selectedItemKeys.valueOf(it) }
-        )
         is Event.ErrorPageVisited -> EventWrapper(
             { ErrorPage.visitedError.record(it) },
             { ErrorPage.visitedErrorKeys.valueOf(it) }

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

@@ -29,7 +29,6 @@ import org.mozilla.fenix.GleanMetrics.ContextMenu
 import org.mozilla.fenix.GleanMetrics.CrashReporter
 import org.mozilla.fenix.GleanMetrics.ErrorPage
 import org.mozilla.fenix.GleanMetrics.Events
-import org.mozilla.fenix.GleanMetrics.Library
 import org.mozilla.fenix.GleanMetrics.Logins
 import org.mozilla.fenix.GleanMetrics.SearchShortcuts
 import org.mozilla.fenix.GleanMetrics.Tip
@@ -67,8 +66,6 @@ sealed class Event {
     object QRScannerPromptDisplayed : Event()
     object QRScannerNavigationAllowed : Event()
     object QRScannerNavigationDenied : Event()
-    object LibraryOpened : Event()
-    object LibraryClosed : Event()
     object SyncAuthOpened : Event()
     object SyncAuthClosed : Event()
     object SyncAuthSignUp : Event()
@@ -267,12 +264,6 @@ sealed class Event {
             )
     }
 
-    data class LibrarySelectedItem(val item: LibraryItem) : Event() {
-        enum class LibraryItem { BOOKMARKS, HISTORY }
-        override val extras: Map<Library.selectedItemKeys, String>?
-            get() = mapOf(Library.selectedItemKeys.item to item.name)
-    }
-
     data class ErrorPageVisited(val errorType: ErrorType) : Event() {
         override val extras: Map<ErrorPage.visitedErrorKeys, String>?
             get() = mapOf(ErrorPage.visitedErrorKeys.errorType to errorType.name)
@@ -408,7 +399,7 @@ sealed class Event {
 
     data class BrowserMenuItemTapped(val item: Item) : Event() {
         enum class Item {
-            SETTINGS, LIBRARY, HELP, DESKTOP_VIEW_ON, DESKTOP_VIEW_OFF, FIND_IN_PAGE, NEW_TAB,
+            SETTINGS, HELP, DESKTOP_VIEW_ON, DESKTOP_VIEW_OFF, FIND_IN_PAGE, NEW_TAB,
             NEW_PRIVATE_TAB, SHARE, REPORT_SITE_ISSUE, BACK, FORWARD, RELOAD, STOP, OPEN_IN_FENIX,
             SAVE_TO_COLLECTION, ADD_TO_TOP_SITES, ADD_TO_HOMESCREEN, QUIT, READER_MODE_ON,
             READER_MODE_OFF, OPEN_IN_APP, BOOKMARK, READER_MODE_APPEARANCE, ADDONS_MANAGER,