wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1114821 - Remove nightly-only flag for about logins.r=liuche

Browse Source
This commit is contained in:
Allison Naaktgeboren 2015-08-17 23:22:24 -07:00
parent 26f0001835
commit 2a33e76188
11 changed files with 11 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/BrowserApp.java
View File

@ -3195,7 +3195,7 @@ public class BrowserApp extends GeckoApp
ClearOnShutdownPref.PREF,
new HashSet<String>()).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);

7
mobile/android/base/preferences/GeckoPreferences.java
View File

@ -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) {

3
mobile/android/base/resources/xml/preferences_privacy.xml
View File

@ -38,8 +38,7 @@
<PreferenceCategory android:title="@string/pref_category_logins">
<org.mozilla.gecko.preferences.LinkPreference android:key="android.not_a_preference.signon.manage"
android:title="@string/pref_manage_logins"
<org.mozilla.gecko.preferences.LinkPreference android:title="@string/pref_manage_logins"
url="about:logins"/>
<CheckBoxPreference android:key="signon.rememberSignons"

2
mobile/android/chrome/jar.mn
View File

@ -59,9 +59,9 @@ chrome.jar:
content/aboutDevices.xhtml (content/aboutDevices.xhtml)
content/aboutDevices.js (content/aboutDevices.js)
#endif
#ifdef NIGHTLY_BUILD
content/aboutLogins.xhtml (content/aboutLogins.xhtml)
content/aboutLogins.js (content/aboutLogins.js)
#ifdef NIGHTLY_BUILD
content/WebcompatReporter.js (content/WebcompatReporter.js)
#endif
#ifdef MOZ_PAY

10
mobile/android/components/AboutRedirector.js
View File

@ -71,6 +71,10 @@ let modules = {
uri: "chrome://browser/content/aboutPrivateBrowsing.xhtml",
privileged: true
},
logins: {
uri: "chrome://browser/content/aboutLogins.xhtml",
privileged: true
},
}
if (AppConstants.MOZ_SERVICES_HEALTHREPORT) {
@ -85,12 +89,6 @@ if (AppConstants.MOZ_DEVICES) {
privileged: true
};
}
if (AppConstants.NIGHTLY_BUILD) {
modules['logins'] = {
uri: "chrome://browser/content/aboutLogins.xhtml",
privileged: true
};
}
function AboutRedirector() {}
AboutRedirector.prototype = {

3
mobile/android/components/MobileComponents.manifest
View File

@ -20,9 +20,8 @@ contract @mozilla.org/network/protocol/about;1?what=blocked {322ba47e-7047-4f71-
#ifdef MOZ_DEVICES
contract @mozilla.org/network/protocol/about;1?what=devices {322ba47e-7047-4f71-aebf-cb7d69325cd9}
#endif
#ifdef NIGHTLY_BUILD
contract @mozilla.org/network/protocol/about;1?what=logins {322ba47e-7047-4f71-aebf-cb7d69325cd9}
#endif
# DirectoryProvider.js
component {ef0f7a87-c1ee-45a8-8d67-26f586e46a4b} DirectoryProvider.js

2
mobile/android/locales/jar.mn
View File

@ -37,9 +37,9 @@
locale/@AB_CD@/browser/payments.properties (%chrome/payments.properties)
locale/@AB_CD@/browser/handling.properties (%chrome/handling.properties)
locale/@AB_CD@/browser/webapp.properties (%chrome/webapp.properties)
#ifdef NIGHTLY_BUILD
locale/@AB_CD@/browser/aboutLogins.dtd (%chrome/aboutLogins.dtd)
locale/@AB_CD@/browser/aboutLogins.properties (%chrome/aboutLogins.properties)
#ifdef NIGHTLY_BUILD
locale/@AB_CD@/browser/webcompatReporter.properties (%chrome/webcompatReporter.properties)
#endif

7
mobile/android/tests/browser/chrome/test_about_logins.html
View File

@ -77,12 +77,7 @@ Migrated from Robocop: https://bugzilla.mozilla.org/show_bug.cgi?id=1184186
SimpleTest.finish();
}
if (AppConstants.NIGHTLY_BUILD) {
password_setup();
} else {
ok(true, "this test is disabled on non-Nightly builds");
SimpleTest.finish();
}
password_setup();
</script>
</head>

9
mobile/android/tests/browser/robocop/testSettingsMenuItems.java
View File

@ -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<String[]> 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" };

14
mobile/android/tests/browser/robocop/testSystemPages.java
View File

@ -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;
}
}

2
mobile/android/themes/core/jar.mn
View File

@ -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)