Bug 906339 - Remove testing for "Automatic updates" on release builds. r=gbrown
authorChenxia Liu <liuche@mozilla.com>
Mon, 26 Aug 2013 16:00:07 -0700
changeset 144415 092d8cc931f8a1838b8a1e1859798eefdbbc2ff2
parent 144414 7b5fe881c6509dfe6c7d178de535ef807fd34ae2
child 144416 d3d43286b8e0d557b1984917814a16861dd91d8e
push id25161
push userttaubert@mozilla.com
push dateTue, 27 Aug 2013 05:56:58 +0000
treeherdermozilla-central@e42dce3209da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgbrown
bugs906339
milestone26.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 906339 - Remove testing for "Automatic updates" on release builds. r=gbrown
mobile/android/base/tests/testSettingsMenuItems.java.in
--- a/mobile/android/base/tests/testSettingsMenuItems.java.in
+++ b/mobile/android/base/tests/testSettingsMenuItems.java.in
@@ -31,17 +31,16 @@ public class testSettingsMenuItems exten
      * based on build (e.g., release vs. nightly), add the items in <code>addConditionalSettings</code>. 
      */
 
     // Customize menu items.
     String[][] OPTIONS_CUSTOMIZE = {
         { "Search settings", "", "Show search suggestions", "Installed search engines"},
         { "Import from Android", "", "Bookmarks", "History", "Import" },
         { "Tabs", "Don't restore after quitting " + BRAND_NAME, "Always restore", "Don't restore after quitting " + BRAND_NAME },
-        { "Automatic updates", "Only over Wi-Fi", "Enabled", "Only over Wi-Fi", "Disabled" },
     };
 
     // Display menu items.
     String[][] OPTIONS_DISPLAY = {
         { "Text size" },
         { "Title bar", "Show page title", "Show page title", "Show page address" },
         { "Advanced" },
         { "Character encoding", "Don't show menu", "Show menu", "Don't show menu" },
@@ -148,16 +147,24 @@ public class testSettingsMenuItems exten
             // Text reflow
             Field textReflowField = appConstants.getField("RELEASE_BUILD");
             boolean textReflow = textReflowField.getBoolean(appConstants);
             if (textReflow) {
                 String[] textReflowUi = { "Text reflow" };
                 settingsMap.get("Display").add(textReflowUi);
             }
 
+            // Automatic updates
+            Field autoUpdateField = appConstants.getField("MOZ_UPDATER");
+            boolean autoUpdate = autoUpdateField.getBoolean(appConstants);
+            if (autoUpdate) {
+                String[] autoUpdateUi = { "Automatic updates", "Only over Wi-Fi", "Enabled", "Only over Wi-Fi", "Disabled" };
+                settingsMap.get("Customize").add(autoUpdateUi);
+            }
+
             // Crash reporter
             Field crashReportingField = appConstants.getField("MOZ_CRASHREPORTER");
             boolean crashReporter = crashReportingField.getBoolean(appConstants);
             if (crashReporter) {
                 String[] crashReporterUi = { "Crash Reporter", BRAND_NAME + " submits crash reports to help Mozilla make your browser more stable and secure" };
                 settingsMap.get("Mozilla").add(crashReporterUi);
             }