diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 597b3e2b0a73..940a80c07318 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1707,8 +1707,6 @@ pref("image.mem.max_decoded_image_kb", 256000);
pref("loop.enabled", true);
pref("loop.textChat.enabled", true);
pref("loop.server", "https://loop.services.mozilla.com/v0");
-pref("loop.seenToS", "unseen");
-pref("loop.showPartnerLogo", true);
pref("loop.gettingStarted.seen", false);
pref("loop.gettingStarted.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/hello/start/");
pref("loop.gettingStarted.resumeOnFirstJoin", false);
diff --git a/browser/base/content/tabbrowser.xml b/browser/base/content/tabbrowser.xml
index 673c5d8d456b..86f7e096aa07 100644
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -563,8 +563,20 @@
+
- {mozL10n.get("powered_by_beforeLogo")}
-
- {mozL10n.get("powered_by_afterLogo")}
-
- );
- },
-
render: function() {
- if (!this.state.gettingStartedSeen || this.state.seenToS == "unseen") {
- var terms_of_use_url = navigator.mozLoop.getLoopPref("legal.ToS_url");
- var privacy_notice_url = navigator.mozLoop.getLoopPref("legal.privacy_url");
- var tosHTML = mozL10n.get("legal_text_and_links3", {
- "clientShortname": mozL10n.get("clientShortname2"),
- "terms_of_use": React.renderToStaticMarkup(
-
- {mozL10n.get("legal_text_tos")}
-
- ),
- "privacy_notice": React.renderToStaticMarkup(
-
- {mozL10n.get("legal_text_privacy")}
-
- )
- });
- return (
-
- {this.renderPartnerLogo()}
-
-
- );
- } else {
- return ;
- }
+ var locale = mozL10n.getLanguage();
+ var terms_of_use_url = navigator.mozLoop.getLoopPref("legal.ToS_url");
+ var privacy_notice_url = navigator.mozLoop.getLoopPref("legal.privacy_url");
+ var tosHTML = mozL10n.get("legal_text_and_links3", {
+ "clientShortname": mozL10n.get("clientShortname2"),
+ "terms_of_use": React.renderToStaticMarkup(
+
+ {mozL10n.get("legal_text_tos")}
+
+ ),
+ "privacy_notice": React.renderToStaticMarkup(
+
+ {mozL10n.get("legal_text_privacy")}
+
+ )
+ });
+ return (
+
+
+ {mozL10n.get("powered_by_beforeLogo")}
+
+ {mozL10n.get("powered_by_afterLogo")}
+
+
+
+ );
}
});
@@ -970,7 +945,6 @@ loop.panel = (function(_, mozL10n) {
mozLoop={this.props.mozLoop}
store={this.props.roomStore}
userProfile={this.state.userProfile} />
-
{
@@ -25,9 +23,6 @@ add_test(function test_openChatWindow_on_notification() {
waitForCondition(() => opened).then(() => {
do_check_true(opened, "should open a chat window");
- do_check_eq(Services.prefs.getCharPref("loop.seenToS"), "seen",
- "should set the pref to 'seen'");
-
run_next_test();
}, () => {
do_throw("should have opened a chat window");
@@ -56,9 +51,6 @@ function run_test() {
do_register_cleanup(function() {
// Revert original Chat.open implementation
Chat.open = openChatOrig;
-
- // clear test pref
- Services.prefs.clearUserPref("loop.seenToS");
});
run_next_test();
diff --git a/browser/components/preferences/in-content/sync.js b/browser/components/preferences/in-content/sync.js
index c4b4993f5c8d..c4a8e4da073d 100644
--- a/browser/components/preferences/in-content/sync.js
+++ b/browser/components/preferences/in-content/sync.js
@@ -240,18 +240,14 @@ let gSyncPane = {
gSyncPane.startOver(true);
return false;
});
- setEventListener("noFxaSignUp", "click", function () {
+ setEventListener("noFxaSignUp", "command", function () {
gSyncPane.signUp();
return false;
});
- setEventListener("noFxaSignIn", "click", function () {
+ setEventListener("noFxaSignIn", "command", function () {
gSyncPane.signIn();
return false;
});
- setEventListener("noFxaUseOldSync", "click", function () {
- gSyncPane.openOldSyncSupportPage();
- return false;
- });
setEventListener("verifiedManage", "command",
gSyncPane.manageFirefoxAccount);
setEventListener("fxaUnlinkButton", "click", function () {
@@ -259,13 +255,13 @@ let gSyncPane = {
});
setEventListener("verifyFxaAccount", "command",
gSyncPane.verifyFirefoxAccount);
- setEventListener("unverifiedUnlinkFxaAccount", "click", function () {
+ setEventListener("unverifiedUnlinkFxaAccount", "command", function () {
/* no warning as account can't have previously synced */
gSyncPane.unlinkFirefoxAccount(false);
});
setEventListener("rejectReSignIn", "command",
gSyncPane.reSignIn);
- setEventListener("rejectUnlinkFxaAccount", "click", function () {
+ setEventListener("rejectUnlinkFxaAccount", "command", function () {
gSyncPane.unlinkFirefoxAccount(true);
});
setEventListener("tosPP-small-ToS", "click", gSyncPane.openToS);
diff --git a/browser/components/preferences/in-content/sync.xul b/browser/components/preferences/in-content/sync.xul
index 1f4b364d0fa9..9bfaf028690a 100644
--- a/browser/components/preferences/in-content/sync.xul
+++ b/browser/components/preferences/in-content/sync.xul
@@ -200,112 +200,133 @@
-
-
-
-
-
-
+
+
+
+
+
+ &signedOut.description;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &signedInUnverified.beforename.label;
+
+ &signedInUnverified.aftername.label;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ &signedInLoginFailure.beforename.label;
+
+ &signedInLoginFailure.aftername.label;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
- &signedInUnverified.beforename.label;
-
- &signedInUnverified.aftername.label;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- &signedInLoginFailure.beforename.label;
-
- &signedInLoginFailure.aftername.label;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
@@ -329,6 +351,16 @@
+
+
+
+
+
+
+
+
diff --git a/browser/locales/en-US/chrome/browser/loop/loop.properties b/browser/locales/en-US/chrome/browser/loop/loop.properties
index 52efe6e1d285..1cb32927d139 100644
--- a/browser/locales/en-US/chrome/browser/loop/loop.properties
+++ b/browser/locales/en-US/chrome/browser/loop/loop.properties
@@ -55,18 +55,15 @@ problem_accessing_account=There Was A Problem Accessing Your Account
## the appropriate action.
retry_button=Retry
-share_email_subject5={{clientShortname2}} — Join the conversation
-## LOCALIZATION NOTE (share_email_subject_context): This is the alternate email
-## subject when a conversation is shared with a context attached.
-## {{clientShortName2}} will be replaced with the respective string in this file.
-## {{title}} will be replaced with the title of an HTML document.
-share_email_subject_context={{clientShortname2}} conversation: {{title}}
-## LOCALIZATION NOTE (share_email_body4): In this item, don't translate the
+share_email_subject6=Join me for a video conversation
+## LOCALIZATION NOTE (share_email_body6): In this item, don't translate the
## part between {{..}} and leave the \n\n part alone
-share_email_body5=Hello!\n\nJoin me for a video conversation on {{clientShortname2}}.\n\nIt's the easiest way to connect by video with anyone anywhere. With {{clientSuperShortname}}, you don't have to download or install anything. Just click or paste this link into your {{brandShortname}}, Opera or Chrome browser to join the conversation:\n\n{{callUrl}}\n\nIf you'd like to learn more about {{clientSuperShortname}} and how you can start your own free video conversations, visit {{learnMoreUrl}}\n\nTalk to you soon!
-## LOCALIZATION NOTE (share_email_body_context): In this item, don't translate
+share_email_body6=Click the Firefox Hello link to connect to the conversation now: {{callUrl}}
+## LOCALIZATION NOTE (share_email_body_context2): In this item, don't translate
## the part between {{..}} and leave the \n\n part alone.
-share_email_body_context=Hello!\n\nJoin me for a video conversation on {{clientShortname2}} about:\n{{title}}.\n\nIt's the easiest way to connect by video with anyone anywhere. With {{clientSuperShortname}}, you don't have to download or install anything. Just click or paste this link into your {{brandShortname}}, Opera or Chrome browser to join the conversation:\n\n{{callUrl}}\n\nIf you'd like to learn more about {{clientSuperShortname}} and how you can start your own free video conversations, visit {{learnMoreUrl}}\n\nTalk to you soon!
+share_email_body_context2=Join me for a video conversation. Click the Firefox Hello link to connect now: {{callUrl}}\n\nLet’s talk about this during our conversation: {{title}}
+## LOCALIZATION NOTE (share_email_footer): Common footer content for both email types
+share_email_footer=\n\n________\nJoin and create video conversations free with Firefox Hello. Connect easily over video with anyone, anywhere. No downloads or registration. Learn more at http://www.firefox.com/hello
## LOCALIZATION NOTE (share_tweeet): In this item, don't translate the part
## between {{..}}. Please keep the text below 117 characters to make sure it fits
## in a tweet.
diff --git a/browser/locales/en-US/chrome/browser/preferences/sync.dtd b/browser/locales/en-US/chrome/browser/preferences/sync.dtd
index 9bc655049989..605daa635d95 100644
--- a/browser/locales/en-US/chrome/browser/preferences/sync.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/sync.dtd
@@ -83,3 +83,17 @@ both, to better adapt this sentence to their language.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/browser/themes/linux/jar.mn b/browser/themes/linux/jar.mn
index 3ca98270a36a..1b6d6ce5b0ae 100644
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -222,7 +222,14 @@ browser.jar:
skin/classic/browser/preferences/in-content/favicon.ico (../shared/incontentprefs/favicon.ico)
skin/classic/browser/preferences/in-content/icons.svg (../shared/incontentprefs/icons.svg)
skin/classic/browser/preferences/in-content/search.css (../shared/incontentprefs/search.css)
- skin/classic/browser/fxa/default-profile-image.svg (../shared/fxa/default-profile-image.svg)
+ skin/classic/browser/fxa/default-avatar.png (../shared/fxa/default-avatar.png)
+ skin/classic/browser/fxa/default-avatar@2x.png (../shared/fxa/default-avatar@2x.png)
+ skin/classic/browser/fxa/logo.png (../shared/fxa/logo.png)
+ skin/classic/browser/fxa/logo@2x.png (../shared/fxa/logo@2x.png)
+ skin/classic/browser/fxa/sync-illustration.png (../shared/fxa/sync-illustration.png)
+ skin/classic/browser/fxa/sync-illustration@2x.png (../shared/fxa/sync-illustration@2x.png)
+ skin/classic/browser/fxa/android.png (../shared/fxa/android.png)
+ skin/classic/browser/fxa/android@2x.png (../shared/fxa/android@2x.png)
skin/classic/browser/preferences/applications.css (preferences/applications.css)
skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css)
skin/classic/browser/preferences/search.css (preferences/search.css)
diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn
index cd7d24d613c6..2ed2e12421a7 100644
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -298,7 +298,14 @@ browser.jar:
skin/classic/browser/preferences/in-content/favicon.ico (../shared/incontentprefs/favicon.ico)
skin/classic/browser/preferences/in-content/icons.svg (../shared/incontentprefs/icons.svg)
skin/classic/browser/preferences/in-content/search.css (../shared/incontentprefs/search.css)
- skin/classic/browser/fxa/default-profile-image.svg (../shared/fxa/default-profile-image.svg)
+ skin/classic/browser/fxa/default-avatar.png (../shared/fxa/default-avatar.png)
+ skin/classic/browser/fxa/default-avatar@2x.png (../shared/fxa/default-avatar@2x.png)
+ skin/classic/browser/fxa/logo.png (../shared/fxa/logo.png)
+ skin/classic/browser/fxa/logo@2x.png (../shared/fxa/logo@2x.png)
+ skin/classic/browser/fxa/sync-illustration.png (../shared/fxa/sync-illustration.png)
+ skin/classic/browser/fxa/sync-illustration@2x.png (../shared/fxa/sync-illustration@2x.png)
+ skin/classic/browser/fxa/android.png (../shared/fxa/android.png)
+ skin/classic/browser/fxa/android@2x.png (../shared/fxa/android@2x.png)
skin/classic/browser/preferences/applications.css (preferences/applications.css)
skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css)
skin/classic/browser/preferences/search.css (preferences/search.css)
diff --git a/browser/themes/osx/preferences/preferences.css b/browser/themes/osx/preferences/preferences.css
index 932624e065d4..bd17e57fb8b2 100644
--- a/browser/themes/osx/preferences/preferences.css
+++ b/browser/themes/osx/preferences/preferences.css
@@ -238,10 +238,6 @@ html|a.inline-link:-moz-focusring {
margin-bottom: 1em;
}
-#fxaUnlinkButton {
- margin: 0;
-}
-
#noFxaAccount {
margin: 12px 4px;
line-height: 1.2em;
diff --git a/browser/themes/shared/customizableui/panelUIOverlay.inc.css b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
index 28fdd5fd6628..4380ba38771c 100644
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -702,7 +702,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton {
}
#PanelUI-footer-fxa[fxaprofileimage="enabled"] > #PanelUI-fxa-status > #PanelUI-fxa-avatar {
- list-style-image: url(chrome://browser/skin/fxa/default-profile-image.svg);
+ list-style-image: url(chrome://browser/skin/fxa/default-avatar.png)
}
#PanelUI-customize:hover,
@@ -1498,6 +1498,10 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left {
list-style-image: url(chrome://branding/content/icon32.png);
}
+ #PanelUI-footer-fxa[fxaprofileimage="enabled"] > #PanelUI-fxa-status > #PanelUI-fxa-avatar {
+ list-style-image: url(chrome://browser/skin/fxa/default-avatar@2x.png)
+ }
+
#PanelUI-fxa-label,
#PanelUI-fxa-icon {
list-style-image: url(chrome://browser/skin/sync-horizontalbar@2x.png);
diff --git a/browser/themes/shared/fxa/android.png b/browser/themes/shared/fxa/android.png
new file mode 100644
index 000000000000..bb1ada87ffa8
Binary files /dev/null and b/browser/themes/shared/fxa/android.png differ
diff --git a/browser/themes/shared/fxa/android@2x.png b/browser/themes/shared/fxa/android@2x.png
new file mode 100644
index 000000000000..957b9071c7cb
Binary files /dev/null and b/browser/themes/shared/fxa/android@2x.png differ
diff --git a/browser/themes/shared/fxa/default-avatar.png b/browser/themes/shared/fxa/default-avatar.png
new file mode 100644
index 000000000000..6ed0e7a777d3
Binary files /dev/null and b/browser/themes/shared/fxa/default-avatar.png differ
diff --git a/browser/themes/shared/fxa/default-avatar@2x.png b/browser/themes/shared/fxa/default-avatar@2x.png
new file mode 100644
index 000000000000..0bda852f5a40
Binary files /dev/null and b/browser/themes/shared/fxa/default-avatar@2x.png differ
diff --git a/browser/themes/shared/fxa/default-profile-image.svg b/browser/themes/shared/fxa/default-profile-image.svg
deleted file mode 100644
index 2b95431cd6f7..000000000000
--- a/browser/themes/shared/fxa/default-profile-image.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/browser/themes/shared/fxa/logo.png b/browser/themes/shared/fxa/logo.png
new file mode 100644
index 000000000000..b54b392cccd0
Binary files /dev/null and b/browser/themes/shared/fxa/logo.png differ
diff --git a/browser/themes/shared/fxa/logo@2x.png b/browser/themes/shared/fxa/logo@2x.png
new file mode 100644
index 000000000000..5d25f05d8791
Binary files /dev/null and b/browser/themes/shared/fxa/logo@2x.png differ
diff --git a/browser/themes/shared/fxa/sync-illustration.png b/browser/themes/shared/fxa/sync-illustration.png
new file mode 100644
index 000000000000..c6de26c9f9be
Binary files /dev/null and b/browser/themes/shared/fxa/sync-illustration.png differ
diff --git a/browser/themes/shared/fxa/sync-illustration@2x.png b/browser/themes/shared/fxa/sync-illustration@2x.png
new file mode 100644
index 000000000000..bc13da3897dd
Binary files /dev/null and b/browser/themes/shared/fxa/sync-illustration@2x.png differ
diff --git a/browser/themes/shared/incontentprefs/preferences.inc.css b/browser/themes/shared/incontentprefs/preferences.inc.css
index 97ac7cebbfcc..262b4b317ec3 100644
--- a/browser/themes/shared/incontentprefs/preferences.inc.css
+++ b/browser/themes/shared/incontentprefs/preferences.inc.css
@@ -223,32 +223,6 @@ description > html|a {
cursor: pointer;
}
-#fxaProfileImage {
- width: 60px;
- height: 60px;
- border-radius: 50%;
- border-width: 5px;
- border-color: red;
- background-image: url(chrome://browser/skin/fxa/default-profile-image.svg);
- background-size: contain;
- cursor: pointer;
- -moz-margin-end: 15px;
-}
-
-#fxaProfileImage:hover {
- box-shadow: 0px 0px 0px 1px #0095DD;
-}
-
-#fxaProfileImage:active {
- box-shadow: 0px 0px 0px 1px #ff9500;
-}
-
-#noFxaAccount {
- /* Overriding the margins from the base preferences.css theme file.
- These overrides can be simplified by fixing bug 1027174 */
- margin: 0;
-}
-
#weavePrefsDeck > vbox > label,
#weavePrefsDeck > vbox > groupbox,
#weavePrefsDeck > vbox > description,
@@ -397,16 +371,123 @@ description > html|a {
* Sync
*/
+#fxaProfileImage {
+ width: 60px;
+ max-height: 60px;
+ border-radius: 50%;
+ background-image: url(chrome://browser/skin/fxa/default-avatar.png);
+ background-size: contain;
+ margin-inline-end: 15px;
+}
+
+#fxaProfileImage.actionable {
+ cursor: pointer;
+}
+
+#fxaProfileImage.actionable:hover {
+ box-shadow: 0px 0px 0px 1px #0095DD;
+}
+
+#fxaProfileImage.actionable:hover:active {
+ box-shadow: 0px 0px 0px 1px #ff9500;
+}
+
+#noFxaAccount {
+ /* Overriding the margins from the base preferences.css theme file.
+ These overrides can be simplified by fixing bug 1027174 */
+ margin: 0;
+}
+
+#noFxaGroup {
+ -moz-box-flex: 1;
+}
+
+#noFxaGroup > vbox {
+ -moz-box-align: start;
+}
+
#fxaSyncEngines > vbox:first-child {
margin-right: 80px;
}
#fxaSyncComputerName {
- margin-left: 0px;
+ margin-inline-start: 0px;
+ width: 500px;
}
#tosPP-small-ToS {
- margin-bottom: 1em;
+ margin-bottom: 14px;
+}
+
+#noFxaCaption {
+ font-weight: bold;
+ margin-bottom: 11px;
+}
+
+.fxaSyncIllustration {
+ margin-top: 35px;
+}
+
+#syncOptions caption {
+ margin-bottom: 11px;
+}
+
+#fxaDeviceName {
+ margin-bottom: 27.5px;
+}
+
+#noFxaDescription {
+ margin-bottom: 20px !important;
+}
+
+.separator {
+ border-bottom: 1px solid var(--in-content-header-border-color);
+}
+
+.fxaAccountBox {
+ border: 1px solid #D1D2D3;
+ border-radius: 5px;
+ padding: 14px 20px 14px 14px;
+}
+
+#signedOutAccountBoxTitle {
+ margin-inline-start: 6px !important;
+ font-weight: bold;
+ margin-bottom: 11px;
+}
+
+.fxaAccountBox button {
+ padding-left: 11px;
+ padding-right: 11px;
+}
+
+.fxaSyncIllustration {
+ width: 231px;
+ max-height: 200px;
+ list-style-image: url(chrome://browser/skin/fxa/sync-illustration.png)
+}
+
+.fxaFirefoxLogo {
+ list-style-image: url(chrome://browser/skin/fxa/logo.png);
+ max-width: 64px;
+ margin-inline-end: 14px;
+}
+
+#noFxaAccount .fxaMobilePromo {
+ margin-bottom: 55px;
+}
+
+#hasFxaAccount .fxaMobilePromo {
+ margin-bottom: 41px;
+ margin-top: 27.5px;
+}
+
+.fxaMobilePromo > label {
+ margin-inline-start: 0;
+}
+
+#hasFxaAccount .fxaAccountBoxButtons {
+ margin-top: 11px;
}
#fxaLoginRejectedWarning {
@@ -414,3 +495,38 @@ description > html|a {
filter: drop-shadow(0 1px 0 hsla(206, 50%, 10%, .15));
margin: 4px 8px 0px 0px;
}
+
+#syncOptions {
+ margin-bottom: 27.5px;
+}
+
+.androidLogo {
+ list-style-image: url(chrome://browser/skin/fxa/android.png);
+ max-width: 24px;
+ margin-top: -4px;
+ margin-inline-end: 4px;
+}
+
+#tosPP-small {
+ margin-bottom: 20px;
+}
+
+.androidAttribution {
+ font-size: 12px;
+ color: #D1D2D3;
+}
+
+@media (min-resolution: 1.1dppx) {
+ .fxaSyncIllustration {
+ list-style-image: url(chrome://browser/skin/fxa/sync-illustration@2x.png)
+ }
+ .fxaFirefoxLogo {
+ list-style-image: url(chrome://browser/skin/fxa/logo@2x.png);
+ }
+ .androidLogo {
+ list-style-image: url(chrome://browser/skin/fxa/android@2x.png);
+ }
+ #fxaProfileImage {
+ background-image: url(chrome://browser/skin/fxa/default-avatar@2x.png);
+ }
+}
diff --git a/browser/themes/windows/jar.mn b/browser/themes/windows/jar.mn
index e9c58e331a8d..bd152435bf5e 100644
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -307,7 +307,14 @@ browser.jar:
skin/classic/browser/preferences/in-content/favicon.ico (../shared/incontentprefs/favicon.ico)
skin/classic/browser/preferences/in-content/icons.svg (../shared/incontentprefs/icons.svg)
skin/classic/browser/preferences/in-content/search.css (../shared/incontentprefs/search.css)
- skin/classic/browser/fxa/default-profile-image.svg (../shared/fxa/default-profile-image.svg)
+ skin/classic/browser/fxa/default-avatar.png (../shared/fxa/default-avatar.png)
+ skin/classic/browser/fxa/default-avatar@2x.png (../shared/fxa/default-avatar@2x.png)
+ skin/classic/browser/fxa/logo.png (../shared/fxa/logo.png)
+ skin/classic/browser/fxa/logo@2x.png (../shared/fxa/logo@2x.png)
+ skin/classic/browser/fxa/sync-illustration.png (../shared/fxa/sync-illustration.png)
+ skin/classic/browser/fxa/sync-illustration@2x.png (../shared/fxa/sync-illustration@2x.png)
+ skin/classic/browser/fxa/android.png (../shared/fxa/android.png)
+ skin/classic/browser/fxa/android@2x.png (../shared/fxa/android@2x.png)
skin/classic/browser/preferences/applications.css (preferences/applications.css)
skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css)
skin/classic/browser/preferences/search.css (preferences/search.css)
diff --git a/docshell/base/timeline/AutoGlobalTimelineMarker.cpp b/docshell/base/timeline/AutoGlobalTimelineMarker.cpp
index 9baf8df95f13..6f38b09a27a4 100644
--- a/docshell/base/timeline/AutoGlobalTimelineMarker.cpp
+++ b/docshell/base/timeline/AutoGlobalTimelineMarker.cpp
@@ -22,7 +22,7 @@ AutoGlobalTimelineMarker::AutoGlobalTimelineMarker(const char* aName
return;
}
- TimelineConsumers::AddMarkerToAllObservedDocShells(mName, TRACING_INTERVAL_START);
+ TimelineConsumers::AddMarkerForAllObservedDocShells(mName, TRACING_INTERVAL_START);
}
AutoGlobalTimelineMarker::~AutoGlobalTimelineMarker()
@@ -31,7 +31,7 @@ AutoGlobalTimelineMarker::~AutoGlobalTimelineMarker()
return;
}
- TimelineConsumers::AddMarkerToAllObservedDocShells(mName, TRACING_INTERVAL_END);
+ TimelineConsumers::AddMarkerForAllObservedDocShells(mName, TRACING_INTERVAL_END);
}
} // namespace mozilla
diff --git a/docshell/base/timeline/TimelineConsumers.cpp b/docshell/base/timeline/TimelineConsumers.cpp
index a55e7c55d760..13f0a05abda9 100644
--- a/docshell/base/timeline/TimelineConsumers.cpp
+++ b/docshell/base/timeline/TimelineConsumers.cpp
@@ -84,8 +84,8 @@ TimelineConsumers::AddMarkerForDocShell(nsDocShell* aDocShell,
}
void
-TimelineConsumers::AddMarkerToDocShellsList(Vector>& aDocShells,
- const char* aName, TracingMetadata aMetaData)
+TimelineConsumers::AddMarkerForDocShellsList(Vector>& aDocShells,
+ const char* aName, TracingMetadata aMetaData)
{
for (Vector>::Range range = aDocShells.all();
!range.empty();
@@ -95,7 +95,7 @@ TimelineConsumers::AddMarkerToDocShellsList(Vector>& aDocSh
}
void
-TimelineConsumers::AddMarkerToAllObservedDocShells(const char* aName, TracingMetadata aMetaData)
+TimelineConsumers::AddMarkerForAllObservedDocShells(const char* aName, TracingMetadata aMetaData)
{
Vector> docShells;
if (!GetKnownDocShells(docShells)) {
@@ -104,7 +104,7 @@ TimelineConsumers::AddMarkerToAllObservedDocShells(const char* aName, TracingMet
return;
}
- AddMarkerToDocShellsList(docShells, aName, aMetaData);
+ AddMarkerForDocShellsList(docShells, aName, aMetaData);
}
} // namespace mozilla
diff --git a/docshell/base/timeline/TimelineConsumers.h b/docshell/base/timeline/TimelineConsumers.h
index fdbed0716177..3540a4287cfb 100644
--- a/docshell/base/timeline/TimelineConsumers.h
+++ b/docshell/base/timeline/TimelineConsumers.h
@@ -37,9 +37,9 @@ public:
UniquePtr&& aMarker);
static void AddMarkerForDocShell(nsDocShell* aDocShell,
const char* aName, TracingMetadata aMetaData);
- static void AddMarkerToDocShellsList(Vector>& aDocShells,
- const char* aName, TracingMetadata aMetaData);
- static void AddMarkerToAllObservedDocShells(const char* aName, TracingMetadata aMetaData);
+ static void AddMarkerForDocShellsList(Vector>& aDocShells,
+ const char* aName, TracingMetadata aMetaData);
+ static void AddMarkerForAllObservedDocShells(const char* aName, TracingMetadata aMetaData);
};
} // namespace mozilla
diff --git a/mobile/android/base/RestrictedProfiles.java b/mobile/android/base/RestrictedProfiles.java
index 6d45c33d39de..ec8dc6e9912b 100644
--- a/mobile/android/base/RestrictedProfiles.java
+++ b/mobile/android/base/RestrictedProfiles.java
@@ -62,7 +62,9 @@ public class RestrictedProfiles {
}
final UserManager mgr = (UserManager) context.getSystemService(Context.USER_SERVICE);
- Bundle restrictions = mgr.getApplicationRestrictions(context.getPackageName());
+ final Bundle restrictions = new Bundle();
+ restrictions.putAll(mgr.getApplicationRestrictions(context.getPackageName()));
+ restrictions.putAll(mgr.getUserRestrictions());
for (String key : restrictions.keySet()) {
if (restrictions.getBoolean(key)) {
diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
index e96d16b83b6f..936407e9b43c 100644
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -100,9 +100,7 @@ MOZ_ANDROID_MLS_STUMBLER=1
MOZ_ANDROID_DOWNLOADS_INTEGRATION=1
# Enable Tab Queue
-if test "$NIGHTLY_BUILD"; then
- MOZ_ANDROID_TAB_QUEUE=1
-fi
+MOZ_ANDROID_TAB_QUEUE=1
# Use the low-memory GC tuning.
export JS_GC_SMALL_CHUNK_SIZE=1
diff --git a/toolkit/components/telemetry/TelemetryEnvironment.jsm b/toolkit/components/telemetry/TelemetryEnvironment.jsm
index 56f447e69835..d1ab2daba495 100644
--- a/toolkit/components/telemetry/TelemetryEnvironment.jsm
+++ b/toolkit/components/telemetry/TelemetryEnvironment.jsm
@@ -147,7 +147,6 @@ const PREF_DISTRIBUTION_ID = "distribution.id";
const PREF_DISTRIBUTION_VERSION = "distribution.version";
const PREF_DISTRIBUTOR = "app.distributor";
const PREF_DISTRIBUTOR_CHANNEL = "app.distributor.channel";
-const PREF_E10S_ENABLED = "browser.tabs.remote.autostart";
const PREF_HOTFIX_LASTVERSION = "extensions.hotfix.lastVersion";
const PREF_APP_PARTNER_BRANCH = "app.partner.";
const PREF_PARTNER_ID = "mozilla.partner.id";
@@ -1000,7 +999,7 @@ EnvironmentCache.prototype = {
#ifndef MOZ_WIDGET_ANDROID
isDefaultBrowser: this._isDefaultBrowser(),
#endif
- e10sEnabled: Preferences.get(PREF_E10S_ENABLED, false),
+ e10sEnabled: Services.appinfo.browserTabsRemoteAutostart,
telemetryEnabled: Preferences.get(PREF_TELEMETRY_ENABLED, false),
locale: getBrowserLocale(),
update: {
diff --git a/toolkit/components/telemetry/docs/environment.rst b/toolkit/components/telemetry/docs/environment.rst
index aaffcb3a0cdf..f38841c58509 100644
--- a/toolkit/components/telemetry/docs/environment.rst
+++ b/toolkit/components/telemetry/docs/environment.rst
@@ -40,7 +40,7 @@ Structure::
loadPath: , // where the engine line is located; missing if no default
submissionURL: // missing if no default or for user-installed engines
},
- e10sEnabled: , // false on failure
+ e10sEnabled: , // whether e10s is on, i.e. browser tabs open by default in a different process
telemetryEnabled: , // false on failure
locale: , // e.g. "it", null on failure
update: {