From 2a33e76188541f1d33c678b26027d80725281f8f Mon Sep 17 00:00:00 2001 From: Allison Naaktgeboren Date: Mon, 17 Aug 2015 23:22:24 -0700 Subject: [PATCH] Bug 1114821 - Remove nightly-only flag for about logins.r=liuche --- mobile/android/base/BrowserApp.java | 2 +- .../android/base/preferences/GeckoPreferences.java | 7 ------- .../base/resources/xml/preferences_privacy.xml | 3 +-- mobile/android/chrome/jar.mn | 2 +- mobile/android/components/AboutRedirector.js | 10 ++++------ .../android/components/MobileComponents.manifest | 3 +-- mobile/android/locales/jar.mn | 2 +- .../tests/browser/chrome/test_about_logins.html | 7 +------ .../browser/robocop/testSettingsMenuItems.java | 9 +-------- .../tests/browser/robocop/testSystemPages.java | 14 -------------- mobile/android/themes/core/jar.mn | 2 -- 11 files changed, 11 insertions(+), 50 deletions(-) diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java index 326a1d5a7dc..c8b1bff6b8b 100644 --- a/mobile/android/base/BrowserApp.java +++ b/mobile/android/base/BrowserApp.java @@ -3195,7 +3195,7 @@ public class BrowserApp extends GeckoApp ClearOnShutdownPref.PREF, new HashSet()).isEmpty(); aMenu.findItem(R.id.quit).setVisible(visible); - aMenu.findItem(R.id.logins).setVisible(AppConstants.NIGHTLY_BUILD); + aMenu.findItem(R.id.logins).setVisible(visible); if (tab == null || tab.getURL() == null) { bookmark.setEnabled(false); diff --git a/mobile/android/base/preferences/GeckoPreferences.java b/mobile/android/base/preferences/GeckoPreferences.java index 7421384c725..ce7f997a464 100644 --- a/mobile/android/base/preferences/GeckoPreferences.java +++ b/mobile/android/base/preferences/GeckoPreferences.java @@ -117,7 +117,6 @@ OnSharedPreferenceChangeListener private static final String PREFS_CRASHREPORTER_ENABLED = "datareporting.crashreporter.submitEnabled"; private static final String PREFS_MENU_CHAR_ENCODING = "browser.menu.showCharacterEncoding"; private static final String PREFS_MP_ENABLED = "privacy.masterpassword.enabled"; - private static final String PREFS_LOGIN_MANAGE = NON_PREF_PREFIX + "signon.manage"; private static final String PREFS_DISABLE_ZOOMED_VIEW = "ui.zoomedview.disabled"; private static final String PREFS_UPDATER_AUTODOWNLOAD = "app.update.autodownload"; private static final String PREFS_UPDATER_URL = "app.update.url.android"; @@ -736,12 +735,6 @@ OnSharedPreferenceChangeListener i--; continue; } - } else if (PREFS_LOGIN_MANAGE.equals(key)) { - if (!AppConstants.NIGHTLY_BUILD) { - preferences.removePreference(pref); - i--; - continue; - } } else if (PREFS_DISABLE_ZOOMED_VIEW.equals(key)) { // Only enable the ZoomedView / magnifying pref on Nightly. if (!AppConstants.NIGHTLY_BUILD) { diff --git a/mobile/android/base/resources/xml/preferences_privacy.xml b/mobile/android/base/resources/xml/preferences_privacy.xml index ae42d304d1f..a28fad19d4d 100644 --- a/mobile/android/base/resources/xml/preferences_privacy.xml +++ b/mobile/android/base/resources/xml/preferences_privacy.xml @@ -38,8 +38,7 @@ - diff --git a/mobile/android/tests/browser/robocop/testSettingsMenuItems.java b/mobile/android/tests/browser/robocop/testSettingsMenuItems.java index 2d2de5b575a..69dd4121e3f 100644 --- a/mobile/android/tests/browser/robocop/testSettingsMenuItems.java +++ b/mobile/android/tests/browser/robocop/testSettingsMenuItems.java @@ -32,7 +32,6 @@ public class testSettingsMenuItems extends PixelTest { // Privacy menu items. String[] PATH_PRIVACY; - String[] MANAGE_LOGINS_ARR; String[][] OPTIONS_PRIVACY; // Mozilla/vendor menu items. @@ -95,13 +94,12 @@ public class testSettingsMenuItems extends PixelTest { }; PATH_PRIVACY = new String[] { mStringHelper.PRIVACY_SECTION_LABEL }; - MANAGE_LOGINS_ARR = new String[] { mStringHelper.MANAGE_LOGINS_LABEL }; OPTIONS_PRIVACY = new String[][] { { mStringHelper.TRACKING_PROTECTION_LABEL }, { mStringHelper.DNT_LABEL }, { mStringHelper.COOKIES_LABEL, "Enabled", "Enabled, excluding 3rd party", "Disabled" }, { mStringHelper.REMEMBER_LOGINS_LABEL }, - MANAGE_LOGINS_ARR, + { mStringHelper.MANAGE_LOGINS_LABEL }, { mStringHelper.MASTER_PASSWORD_LABEL }, { mStringHelper.CLEAR_PRIVATE_DATA_LABEL, "", "Browsing history", "Search history", "Downloads", "Form history", "Cookies & active logins", mStringHelper.CLEAR_PRIVATE_DATA_LABEL, "Cache", "Offline website data", "Site settings", "Clear data" }, }; @@ -194,11 +192,6 @@ public class testSettingsMenuItems extends PixelTest { } } - if (!AppConstants.NIGHTLY_BUILD) { - final List privacy = settingsMap.get(PATH_PRIVACY); - privacy.remove(MANAGE_LOGINS_ARR); - } - // Automatic updates if (AppConstants.MOZ_UPDATER) { String[] autoUpdateUi = { "Download updates automatically", "Only over Wi-Fi", "Always", "Only over Wi-Fi", "Never" }; diff --git a/mobile/android/tests/browser/robocop/testSystemPages.java b/mobile/android/tests/browser/robocop/testSystemPages.java index 9c25f43c583..876dfb56488 100644 --- a/mobile/android/tests/browser/robocop/testSystemPages.java +++ b/mobile/android/tests/browser/robocop/testSystemPages.java @@ -49,9 +49,6 @@ public class testSystemPages extends PixelTest { // Load from Url the about: pages,verify the Url and the tabs number public void checkUrl(String urls []) { for (String url:urls) { - if (skipItemURL(url)) { - continue; - } loadAndPaint(url); verifyTabCount(mExpectedTabCount); verifyUrl(url); @@ -68,10 +65,6 @@ public class testSystemPages extends PixelTest { String [] pathToItem = item[0]; String expectedUrl = item[1][0]; - if (skipItemURL(expectedUrl)) { - continue; - } - expectedTabCount++; // Set up listeners to catch the page load we're about to do @@ -98,11 +91,4 @@ public class testSystemPages extends PixelTest { verifyTabCount(expectedTabCount); } } - - private boolean skipItemURL(String item) { - if (StringHelper.ABOUT_LOGINS_URL.equals(item) && !AppConstants.NIGHTLY_BUILD) { - return true; - } - return false; - } } diff --git a/mobile/android/themes/core/jar.mn b/mobile/android/themes/core/jar.mn index edeb8866eb8..4a5caf190fc 100644 --- a/mobile/android/themes/core/jar.mn +++ b/mobile/android/themes/core/jar.mn @@ -43,10 +43,8 @@ chrome.jar: #endif # -#ifdef NIGHTLY_BUILD * skin/aboutLogins.css (aboutLogins.css) skin/images/spinning_throbber.svg (images/spinning_throbber.svg) -#endif skin/images/search.png (images/search.png) skin/images/lock.png (images/lock.png)