Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 398 insertions, 0 deletions

diff --git a/application/basilisk/components/preferences/in-content/advanced.xul b/application/basilisk/components/preferences/in-content/advanced.xul
new file mode 100644
index 000000000..4973f8e09
--- /dev/null
+++ b/application/basilisk/components/preferences/in-content/advanced.xul
@@ -0,0 +1,398 @@
+# 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
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+<!-- Advanced panel -->
+
+<script type="application/javascript"
+        src="chrome://browser/content/preferences/in-content/advanced.js"/>
+
+<preferences id="advancedPreferences" hidden="true" data-category="paneAdvanced">
+  <preference id="browser.preferences.advanced.selectedTabIndex"
+              name="browser.preferences.advanced.selectedTabIndex"
+              type="int"/>
+
+  <!-- General tab -->
+  <preference id="accessibility.browsewithcaret"
+              name="accessibility.browsewithcaret"
+              type="bool"/>
+  <preference id="accessibility.typeaheadfind"
+              name="accessibility.typeaheadfind"
+              type="bool"/>
+  <preference id="accessibility.blockautorefresh"
+              name="accessibility.blockautorefresh"
+              type="bool"/>
+#ifdef XP_WIN
+  <preference id="ui.osk.enabled"
+              name="ui.osk.enabled"
+              type="bool"/>
+#endif
+
+  <preference id="general.autoScroll"
+              name="general.autoScroll"
+              type="bool"/>
+  <preference id="general.smoothScroll"
+              name="general.smoothScroll"
+              type="bool"/>
+  <preference id="layers.acceleration.disabled"
+              name="layers.acceleration.disabled"
+              type="bool"
+              inverted="true"/>
+#ifdef XP_WIN
+  <preference id="gfx.direct2d.disabled"
+              name="gfx.direct2d.disabled"
+              type="bool"
+              inverted="true"/>
+#endif
+  <preference id="layout.spellcheckDefault"
+              name="layout.spellcheckDefault"
+              type="int"/>
+
+#ifdef MOZ_TELEMETRY_REPORTING
+  <preference id="toolkit.telemetry.enabled"
+              name="toolkit.telemetry.enabled"
+              type="bool"/>
+#endif
+
+  <!-- Network tab -->
+  <preference id="browser.cache.disk.capacity"
+              name="browser.cache.disk.capacity"
+              type="int"/>
+  <preference id="browser.offline-apps.notify"
+              name="browser.offline-apps.notify"
+              type="bool"/>
+
+  <preference id="browser.cache.disk.smart_size.enabled"
+              name="browser.cache.disk.smart_size.enabled"
+              inverted="true"
+              type="bool"/>
+
+ <!-- Update tab -->
+#ifdef MOZ_UPDATER
+  <preference id="app.update.enabled"
+              name="app.update.enabled"
+              type="bool"/>
+  <preference id="app.update.auto"
+              name="app.update.auto"
+              type="bool"/>
+
+  <preference id="app.update.disable_button.showUpdateHistory"
+              name="app.update.disable_button.showUpdateHistory"
+              type="bool"/>
+
+#ifdef MOZ_MAINTENANCE_SERVICE
+  <preference id="app.update.service.enabled"
+              name="app.update.service.enabled"
+              type="bool"/>
+#endif
+#endif
+
+  <preference id="browser.search.update"
+              name="browser.search.update"
+              type="bool"/>
+
+  <!-- Certificates tab -->
+  <preference id="security.default_personal_cert"
+              name="security.default_personal_cert"
+              type="string"/>
+
+  <preference id="security.disable_button.openCertManager"
+              name="security.disable_button.openCertManager"
+              type="bool"/>
+
+  <preference id="security.disable_button.openDeviceManager"
+              name="security.disable_button.openDeviceManager"
+              type="bool"/>
+
+  <preference id="security.OCSP.enabled"
+              name="security.OCSP.enabled"
+              type="int"/>
+</preferences>
+
+#ifdef HAVE_SHELL_SERVICE
+  <stringbundle id="bundleShell" src="chrome://browser/locale/shellservice.properties"/>
+  <stringbundle id="bundleBrand" src="chrome://branding/locale/brand.properties"/>
+#endif
+  <stringbundle id="bundlePreferences" src="chrome://browser/locale/preferences/preferences.properties"/>
+
+<hbox id="header-advanced"
+      class="header"
+      hidden="true"
+      data-category="paneAdvanced">
+  <label class="header-name" flex="1">&paneAdvanced.title;</label>
+  <html:a class="help-button" target="_blank" aria-label="&helpButton.label;"></html:a>
+</hbox>
+
+<tabbox id="advancedPrefs"
+        handleCtrlTab="false"
+        handleCtrlPageUpDown="false"
+        flex="1"
+        data-category="paneAdvanced"
+        hidden="true">
+
+  <tabs id="tabsElement">
+    <tab id="generalTab" label="&generalTab.label;"/>
+#ifdef MOZ_DATA_REPORTING
+    <tab id="dataChoicesTab" label="&dataChoicesTab.label;"/>
+#endif
+    <tab id="networkTab" label="&networkTab.label;"/>
+    <tab id="updateTab" label="&updateTab.label;"/>
+    <tab id="encryptionTab" label="&certificateTab.label;"/>
+  </tabs>
+
+  <tabpanels flex="1">
+
+    <!-- General -->
+    <tabpanel id="generalPanel" orient="vertical">
+      <!-- Accessibility -->
+      <groupbox id="accessibilityGroup" align="start">
+        <caption><label>&accessibility.label;</label></caption>
+
+#ifdef XP_WIN
+        <checkbox id="useOnScreenKeyboard"
+                  hidden="true"
+                  label="&useOnScreenKeyboard.label;"
+                  accesskey="&useOnScreenKeyboard.accesskey;"
+                  preference="ui.osk.enabled"/>
+#endif
+        <checkbox id="useCursorNavigation"
+                  label="&useCursorNavigation.label;"
+                  accesskey="&useCursorNavigation.accesskey;"
+                  preference="accessibility.browsewithcaret"/>
+        <checkbox id="searchStartTyping"
+                  label="&searchStartTyping.label;"
+                  accesskey="&searchStartTyping.accesskey;"
+                  preference="accessibility.typeaheadfind"/>
+        <checkbox id="blockAutoRefresh"
+                  label="&blockAutoRefresh.label;"
+                  accesskey="&blockAutoRefresh.accesskey;"
+                  preference="accessibility.blockautorefresh"/>
+      </groupbox>
+      <!-- Browsing -->
+      <groupbox id="browsingGroup" align="start">
+        <caption><label>&browsing.label;</label></caption>
+
+        <checkbox id="useAutoScroll"
+                  label="&useAutoScroll.label;"
+                  accesskey="&useAutoScroll.accesskey;"
+                  preference="general.autoScroll"/>
+        <checkbox id="useSmoothScrolling"
+                  label="&useSmoothScrolling.label;"
+                  accesskey="&useSmoothScrolling.accesskey;"
+                  preference="general.smoothScroll"/>
+        <checkbox id="allowHWAccel"
+                  label="&allowHWAccel.label;"
+                  accesskey="&allowHWAccel.accesskey;"
+                  preference="layers.acceleration.disabled"/>
+        <checkbox id="checkSpelling"
+                  label="&checkSpelling.label;"
+                  accesskey="&checkSpelling.accesskey;"
+                  onsyncfrompreference="return gAdvancedPane.readCheckSpelling();"
+                  onsynctopreference="return gAdvancedPane.writeCheckSpelling();"
+                  preference="layout.spellcheckDefault"/>
+      </groupbox>
+    </tabpanel>
+#ifdef MOZ_DATA_REPORTING
+    <!-- Data Choices -->
+    <tabpanel id="dataChoicesPanel" orient="vertical">
+#ifdef MOZ_TELEMETRY_REPORTING
+      <groupbox>
+        <caption>
+          <checkbox id="submitHealthReportBox" label="&enableHealthReport.label;"
+                    accesskey="&enableHealthReport.accesskey;"/>
+        </caption>
+        <vbox>
+          <hbox class="indent">
+            <label flex="1">&healthReportDesc.label;</label>
+            <spacer flex="10"/>
+            <label id="FHRLearnMore"
+                   class="text-link">&healthReportLearnMore.label;</label>
+          </hbox>
+          <hbox class="indent">
+            <groupbox flex="1">
+              <caption>
+                <checkbox id="submitTelemetryBox" preference="toolkit.telemetry.enabled"
+                          label="&enableTelemetryData.label;"
+                          accesskey="&enableTelemetryData.accesskey;"/>
+              </caption>
+              <hbox class="indent">
+                <label id="telemetryDataDesc" flex="1">&telemetryDesc.label;</label>
+                <spacer flex="10"/>
+                <label id="telemetryLearnMore"
+                       class="text-link">&telemetryLearnMore.label;</label>
+              </hbox>
+            </groupbox>
+          </hbox>
+        </vbox>
+      </groupbox>
+#endif
+    </tabpanel>
+#endif
+
+    <!-- Network -->
+    <tabpanel id="networkPanel" orient="vertical">
+
+      <!-- Connection -->
+      <groupbox id="connectionGroup">
+        <caption><label>&connection.label;</label></caption>
+
+        <hbox align="center">
+          <description flex="1" control="connectionSettings">&connectionDesc.label;</description>
+          <button id="connectionSettings" icon="network" label="&connectionSettings.label;"
+                  accesskey="&connectionSettings.accesskey;"/>
+        </hbox>
+      </groupbox>
+
+      <!-- Cache -->
+      <groupbox id="cacheGroup">
+        <caption><label>&httpCache.label;</label></caption>
+
+        <hbox align="center">
+          <label id="actualDiskCacheSize" flex="1"/>
+          <button id="clearCacheButton" icon="clear"
+                  label="&clearCacheNow.label;" accesskey="&clearCacheNow.accesskey;"/>
+        </hbox>
+        <hbox>
+          <checkbox preference="browser.cache.disk.smart_size.enabled"
+                    id="allowSmartSize"
+                    onsyncfrompreference="return gAdvancedPane.readSmartSizeEnabled();"
+                    label="&overrideSmartCacheSize.label;"
+                    accesskey="&overrideSmartCacheSize.accesskey;"/>
+        </hbox>
+        <hbox align="center" class="indent">
+          <label id="useCacheBefore" control="cacheSize"
+                 accesskey="&limitCacheSizeBefore.accesskey;">
+            &limitCacheSizeBefore.label;
+          </label>
+          <textbox id="cacheSize" type="number" size="4" max="1024"
+                   aria-labelledby="useCacheBefore cacheSize useCacheAfter"/>
+          <label id="useCacheAfter" flex="1">&limitCacheSizeAfter.label;</label>
+        </hbox>
+      </groupbox>
+
+      <!-- Offline apps -->
+      <groupbox id="offlineGroup">
+        <caption><label>&offlineStorage2.label;</label></caption>
+
+        <hbox align="center">
+          <label id="actualAppCacheSize" flex="1"/>
+          <button id="clearOfflineAppCacheButton" icon="clear"
+                  label="&clearOfflineAppCacheNow.label;" accesskey="&clearOfflineAppCacheNow.accesskey;"/>
+        </hbox>
+        <hbox align="center">
+          <checkbox id="offlineNotify"
+                    label="&offlineNotify.label;" accesskey="&offlineNotify.accesskey;"
+                    preference="browser.offline-apps.notify"
+                    onsyncfrompreference="return gAdvancedPane.readOfflineNotify();"/>
+          <spacer flex="1"/>
+          <button id="offlineNotifyExceptions"
+                  label="&offlineNotifyExceptions.label;"
+                  accesskey="&offlineNotifyExceptions.accesskey;"/>
+        </hbox>
+        <hbox>
+          <vbox flex="1">
+            <label id="offlineAppsListLabel">&offlineAppsList2.label;</label>
+            <listbox id="offlineAppsList"
+                    flex="1"
+                    aria-labelledby="offlineAppsListLabel">
+            </listbox>
+          </vbox>
+          <vbox pack="end">
+            <button id="offlineAppsListRemove"
+                    disabled="true"
+                    label="&offlineAppsListRemove.label;"
+                    accesskey="&offlineAppsListRemove.accesskey;"/>
+          </vbox>
+        </hbox>
+      </groupbox>
+    </tabpanel>
+
+    <!-- Update -->
+    <tabpanel id="updatePanel" orient="vertical">
+#ifdef MOZ_UPDATER
+      <groupbox id="updateApp" align="start">
+        <caption><label>&updateApp.label;</label></caption>
+        <radiogroup id="updateRadioGroup" align="start">
+          <radio id="autoDesktop"
+                 value="auto"
+                 label="&updateAuto1.label;"
+                 accesskey="&updateAuto1.accesskey;"/>
+          <radio value="checkOnly"
+                label="&updateCheck.label;"
+                accesskey="&updateCheck.accesskey;"/>
+          <radio value="manual"
+                label="&updateManual.label;"
+                accesskey="&updateManual.accesskey;"/>
+        </radiogroup>
+        <separator class="thin"/>
+        <hbox>
+          <button id="showUpdateHistory"
+                  label="&updateHistory.label;"
+                  accesskey="&updateHistory.accesskey;"
+                  preference="app.update.disable_button.showUpdateHistory"/>
+        </hbox>
+
+#ifdef MOZ_MAINTENANCE_SERVICE
+        <checkbox id="useService"
+                  label="&useService.label;"
+                  accesskey="&useService.accesskey;"
+                  preference="app.update.service.enabled"/>
+#endif
+      </groupbox>
+#endif
+      <groupbox id="updateOthers" align="start">
+        <caption><label>&updateOthers.label;</label></caption>
+        <checkbox id="enableSearchUpdate"
+                  label="&enableSearchUpdate.label;"
+                  accesskey="&enableSearchUpdate.accesskey;"
+                  preference="browser.search.update"/>
+      </groupbox>
+    </tabpanel>
+
+    <!-- Certificates -->
+    <tabpanel id="encryptionPanel" orient="vertical">
+      <groupbox id="certSelection" align="start">
+        <caption><label>&certSelection.label;</label></caption>
+        <description id="CertSelectionDesc" control="certSelection">&certSelection.description;</description>
+
+        <!--
+          The values on these radio buttons may look like l12y issues, but
+          they're not - this preference uses *those strings* as its values.
+          I KID YOU NOT.
+        -->
+        <radiogroup id="certSelection"
+                    preftype="string"
+                    preference="security.default_personal_cert"
+                    aria-labelledby="CertSelectionDesc">
+          <radio label="&certs.auto;"
+                 accesskey="&certs.auto.accesskey;"
+                 value="Select Automatically"/>
+          <radio label="&certs.ask;"
+                 accesskey="&certs.ask.accesskey;"
+                 value="Ask Every Time"/>
+        </radiogroup>
+      </groupbox>
+      <separator/>
+      <checkbox id="enableOCSP"
+                label="&enableOCSP.label;"
+                accesskey="&enableOCSP.accesskey;"
+                onsyncfrompreference="return gAdvancedPane.readEnableOCSP();"
+                onsynctopreference="return gAdvancedPane.writeEnableOCSP();"
+                preference="security.OCSP.enabled"/>
+      <separator/>
+      <hbox>
+        <button id="viewCertificatesButton"
+                flex="1"
+                label="&viewCerts.label;"
+                accesskey="&viewCerts.accesskey;"
+                preference="security.disable_button.openCertManager"/>
+        <button id="viewSecurityDevicesButton"
+                flex="1"
+                label="&viewSecurityDevices.label;"
+                accesskey="&viewSecurityDevices.accesskey;"
+                preference="security.disable_button.openDeviceManager"/>
+        <hbox flex="10"/>
+      </hbox>
+    </tabpanel>
+  </tabpanels>
+</tabbox>