Bug 737596 - Enable Telemetry by default on Nightly and Aurora channels (mobile). r=bnicholson

build/automation.py.in

@@ -407,7 +407,8 @@ user_pref("app.update.enabled", false);
 user_pref("app.update.staging.enabled", false);
 user_pref("browser.panorama.experienced_first_run", true); // Assume experienced
 user_pref("dom.w3c_touch_events.enabled", 1);
-user_pref("toolkit.telemetry.prompted", 2);
+#expand user_pref("toolkit.telemetry.prompted", __MOZ_TELEMETRY_DISPLAY_REV__);
+#expand user_pref("toolkit.telemetry.notifiedOptOut", __MOZ_TELEMETRY_DISPLAY_REV__);
 // Existing tests assume there is no font size inflation.
 user_pref("font.size.inflation.emPerLine", 0);
 user_pref("font.size.inflation.minTwips", 0);

layout/tools/reftest/remotereftest.py

@@ -315,7 +315,8 @@ user_pref("browser.firstrun.show.localepicker", false);
 user_pref("font.size.inflation.emPerLine", 0);
 user_pref("font.size.inflation.minTwips", 0);
 user_pref("reftest.remote", true);
-user_pref("toolkit.telemetry.prompted", true);
+#expand user_pref("toolkit.telemetry.prompted", __MOZ_TELEMETRY_DISPLAY_REV__);
+#expand user_pref("toolkit.telemetry.notifiedOptOut", __MOZ_TELEMETRY_DISPLAY_REV__);
 user_pref("reftest.uri", "%s");
 """ % reftestlist)
 

layout/tools/reftest/runreftestb2g.py

@@ -405,7 +405,8 @@ user_pref("font.size.inflation.minTwips", 0);
 user_pref("reftest.browser.iframe.enabled", true);
 user_pref("reftest.remote", true);
 user_pref("reftest.uri", "%s");
-user_pref("toolkit.telemetry.prompted", true);
+#expand user_pref("toolkit.telemetry.prompted", __MOZ_TELEMETRY_DISPLAY_REV__);
+#expand user_pref("toolkit.telemetry.notifiedOptOut", __MOZ_TELEMETRY_DISPLAY_REV__);
 user_pref("marionette.loadearly", true);
 """ % reftestlist)
 

mobile/android/app/profile/extensions/feedback@mobile.mozilla.org/content/overlay.xul

@@ -30,7 +30,14 @@
             </setting>
           </settings>
           <settings id="feedback-tools" label="&feedback.tools.title;">
-            <setting pref="toolkit.telemetry.enabled" title="&feedback.allowTelemetry.title;" type="bool"/>
+            <setting
+#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
+                     pref="toolkit.telemetry.enabledPreRelease"
+#else
+                     pref="toolkit.telemetry.enabled"
+#endif
+                     title="&feedback.allowTelemetry.title;"
+                     type="bool"/>
             <setting id="feedback-checkCompatibility" title="&feedback.forceCompat.title;" type="bool" inverted="true" oninputchanged="Feedback.updateRestart();"/>
             <setting pref="devtools.errorconsole.enabled" title="&feedback.errorConsole.title;" type="bool"/>
           </settings>

mobile/android/base/resources/xml/preferences.xml.in

@@ -94,7 +94,12 @@
                             android:persistent="false" />
 
 #ifdef MOZ_TELEMETRY_REPORTING
-        <CheckBoxPreference android:key="toolkit.telemetry.enabled"
+        <CheckBoxPreference
+#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
+                            android:key="toolkit.telemetry.enabledPreRelease"
+#else
+                            android:key="toolkit.telemetry.enabled"
+#endif
                             android:title="@string/pref_telemetry"
                             android:persistent="false" />
 #endif

mobile/android/chrome/content/WebAppRT.js

@@ -27,7 +27,8 @@ var WebAppRT = {
     // Disable add-on installation via the web-exposed APIs
     pref("xpinstall.enabled", false),
     // Disable the telemetry prompt in webapps
-    pref("toolkit.telemetry.prompted", 2)
+#expand user_pref("toolkit.telemetry.prompted", __MOZ_TELEMETRY_DISPLAY_REV__),
+#expand user_pref("toolkit.telemetry.notifiedOptOut", __MOZ_TELEMETRY_DISPLAY_REV__)
   ],
 
   init: function(isUpdate, url) {

mobile/android/chrome/content/about.xhtml

@@ -37,8 +37,14 @@
       <span id="update-message-found">&aboutPage.checkForUpdates.found;</span>
     </div>
 #endif
+
     <div id="aboutTelemetry" hidden="true">
-      <p id="telemetry">&aboutPage.warningVersion;&aboutPage.telemetryStart;<a href="http://www.mozilla.org/">&aboutPage.telemetryMozillaLink;</a>&aboutPage.telemetryEnd;</p>
+      <p id="telemetry">
+        &aboutPage.warningVersion;
+#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
+        &aboutPage.telemetryStart;<a href="http://www.mozilla.org/">&aboutPage.telemetryMozillaLink;</a>&aboutPage.telemetryEnd;
+#endif
+      </p>
     </div>
   </div>
 

mobile/android/chrome/content/browser.js

@@ -1,3 +1,4 @@
+#filter substitution
 // -*- Mode: js2; tab-width: 2; indent-tabs-mode: nil; js2-basic-offset: 2; js2-skip-preprocessor-directives: t; -*-
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7106,12 +7107,16 @@ var RemoteDebugger = {
 
 var Telemetry = {
   _PREF_TELEMETRY_PROMPTED: "toolkit.telemetry.prompted",
+#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
+  _PREF_TELEMETRY_ENABLED: "toolkit.telemetry.enabledPreRelease",
+#else
   _PREF_TELEMETRY_ENABLED: "toolkit.telemetry.enabled",
+#endif
   _PREF_TELEMETRY_REJECTED: "toolkit.telemetry.rejected",
   _PREF_TELEMETRY_SERVER_OWNER: "toolkit.telemetry.server_owner",
 
   // This is used to reprompt users when privacy message changes
-  _TELEMETRY_PROMPT_REV: 2,
+  _TELEMETRY_PROMPT_REV: "@MOZ_TELEMETRY_DISPLAY_REV@",
 
   init: function init() {
     Services.obs.addObserver(this, "Preferences:Set", false);

mobile/android/chrome/jar.mn

@@ -38,7 +38,7 @@ chrome.jar:
   content/SelectHelper.js              (content/SelectHelper.js)
   content/HelperApps.js                (content/HelperApps.js)
   content/dbg-browser-actors.js        (content/dbg-browser-actors.js)
-  content/WebAppRT.js                  (content/WebAppRT.js)
+* content/WebAppRT.js                  (content/WebAppRT.js)
   content/InputWidgetHelper.js         (content/InputWidgetHelper.js)
 
 % content branding %content/branding/

mobile/xul/app/profile/extensions/feedback@mobile.mozilla.org/content/overlay.xul

@@ -30,7 +30,14 @@
             </setting>
           </settings>
           <settings id="feedback-tools" label="&feedback.tools.title;">
-            <setting pref="toolkit.telemetry.enabled" title="&feedback.allowTelemetry.title;" type="bool"/>
+            <setting 
+#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
+                     pref="toolkit.telemetry.enabledPreRelease"
+#else
+                     pref="toolkit.telemetry.enabled"
+#endif
+                     title="&feedback.allowTelemetry.title;"
+                     type="bool"/>
             <setting id="feedback-checkCompatibility" title="&feedback.forceCompat.title;" type="bool" inverted="true" oninputchanged="Feedback.updateRestart();"/>
             <setting pref="devtools.errorconsole.enabled" title="&feedback.errorConsole.title;" type="bool"/>
           </settings>

mobile/xul/chrome/content/about.xhtml

@@ -37,7 +37,12 @@
 #endif
 
     <div id="aboutTelemetry" hidden="true">
-      <p id="telemetry">&aboutPage.warningVersion;&aboutPage.telemetryStart;<a href="http://www.mozilla.org/">&aboutPage.telemetryMozillaLink;</a>&aboutPage.telemetryEnd;</p>
+      <p id="telemetry">
+        &aboutPage.warningVersion;
+#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
+        &aboutPage.telemetryStart;<a href="http://www.mozilla.org/">&aboutPage.telemetryMozillaLink;</a>&aboutPage.telemetryEnd;
+#endif
+      </p>
     </div>
 
     <ul id="aboutLinks">