From 46c9b10f56965f4356b30033c4ddac752df2715d Mon Sep 17 00:00:00 2001
From: Mark Finkle <mfinkle@mozilla.com>
Date: Fri, 19 Feb 2016 14:56:40 -0500
Subject: [PATCH] Bug 1249094 - Add UI Telemetry probes for application
 foreground / background changes r=margaret

---
 .../android/base/java/org/mozilla/gecko/TelemetryContract.java | 3 +++
 mobile/android/chrome/content/browser.js                       | 3 ++-
 mobile/android/docs/uitelemetry.rst                            | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/TelemetryContract.java b/mobile/android/base/java/org/mozilla/gecko/TelemetryContract.java
index 4eff5625835..fe4bf6544a9 100644
--- a/mobile/android/base/java/org/mozilla/gecko/TelemetryContract.java
+++ b/mobile/android/base/java/org/mozilla/gecko/TelemetryContract.java
@@ -188,6 +188,9 @@ public interface TelemetryContract {
         // 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"),
 
diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js
index 6652b64a2fc..12a9e68df47 100644
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -6801,6 +6801,8 @@ var ActivityObserver = {
     let isForeground = false;
     let tab = BrowserApp.selectedTab;
 
+    UITelemetry.addEvent("show.1", "system", null, aTopic);
+
     switch (aTopic) {
       case "application-background" :
         let doc = (tab ? tab.browser.contentDocument : null);
@@ -6828,7 +6830,6 @@ var Telemetry = {
 };
 
 var Experiments = {
-
   // Enable malware download protection (bug 936041)
   MALWARE_DOWNLOAD_PROTECTION: "malware-download-protection",
 
diff --git a/mobile/android/docs/uitelemetry.rst b/mobile/android/docs/uitelemetry.rst
index b1fa01c21db..ed74fa3e1d2 100644
--- a/mobile/android/docs/uitelemetry.rst
+++ b/mobile/android/docs/uitelemetry.rst
@@ -230,6 +230,9 @@ Methods
 ``suggestion``
   Action triggered from a suggested result, like those from search engines or default tiles.
 
+``system``
+  Action triggered from an OS level action, like application foreground / background.
+
 ``toast``
   Action triggered from an unobtrusive, temporary notification.