Bug 1249314 - Cleanup 'tabstray' Telemetry method r=liuche
authorMark Finkle <mfinkle@mozilla.com>
Fri, 19 Feb 2016 14:56:43 -0500
changeset 321296 06e2f969c46e01058b96f1fc890ea236a9ede7dd
parent 321295 f95431e5e7975e3783fbeddcac19495fd0f210d3
child 321297 b35e412b5449aee19aa05ca2e7952ea25bd35adf
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersliuche
bugs1249314
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1249314 - Cleanup 'tabstray' Telemetry method r=liuche
mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
mobile/android/base/java/org/mozilla/gecko/TelemetryContract.java
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -2011,17 +2011,17 @@ public class BrowserApp extends GeckoApp
 
         return true;
     }
 
     private void showTabs(final TabsPanel.Panel panel) {
         if (Tabs.getInstance().getDisplayCount() == 0)
             return;
 
-        hideFirstrunPager(TelemetryContract.Method.TABSTRAY);
+        hideFirstrunPager(TelemetryContract.Method.BUTTON);
 
         if (ensureTabsPanelExists()) {
             // If we've just inflated the tabs panel, only show it once the current
             // layout pass is done to avoid displayed temporary UI states during
             // relayout.
             ViewTreeObserver vto = mTabsPanel.getViewTreeObserver();
             if (vto.isAlive()) {
                 vto.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
--- a/mobile/android/base/java/org/mozilla/gecko/TelemetryContract.java
+++ b/mobile/android/base/java/org/mozilla/gecko/TelemetryContract.java
@@ -186,19 +186,16 @@ public interface TelemetryContract {
         SHARE_OVERLAY("shareoverlay"),
 
         // Action triggered from a suggestion provided to the user.
         SUGGESTION("suggestion"),
 
         // Action triggered from an OS system action.
         SYSTEM("system"),
 
-        // Action triggered from the Tabs tray.
-        TABSTRAY("tabstray"),
-
         // Action triggered from a SuperToast.
         // Note: Only used in JavaScript for now, but here for completeness.
         TOAST("toast"),
 
         // Action triggerred by pressing a SearchWidget button
         WIDGET("widget"),
 
         // VALUES BELOW THIS LINE ARE EXCLUSIVE TO TESTING.