Bug 1187984 - Update about:privatebrowsing to include information about TP; r=liuche
authorMartyn Haigh <mhaigh@mozilla.org>
Fri, 31 Jul 2015 14:04:46 +0100
changeset 287580 398a7477659e6723249f720db1d8fb9bf711f4a8
parent 287579 2ee3ba67281f2ad55c7a5e4c6228b546d6a637e3
child 287581 fbf2c7f465ca87955cd8bb5296b362f418e0d925
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersliuche
bugs1187984
milestone42.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 1187984 - Update about:privatebrowsing to include information about TP; r=liuche
mobile/android/chrome/content/aboutPrivateBrowsing.xhtml
mobile/android/locales/en-US/chrome/aboutPrivateBrowsing.dtd
mobile/android/themes/core/aboutPrivateBrowsing.css
mobile/android/themes/core/images/privatebrowsing-mask-and-shield.svg
mobile/android/themes/core/jar.mn
--- a/mobile/android/chrome/content/aboutPrivateBrowsing.xhtml
+++ b/mobile/android/chrome/content/aboutPrivateBrowsing.xhtml
@@ -20,23 +20,24 @@
     <title>&privatebrowsingpage.title;</title>
     <meta name="viewport" content="width=device-width, initial-scale=1; user-scalable=no"/>
     <link rel="stylesheet" href="chrome://browser/skin/aboutPrivateBrowsing.css" type="text/css" media="all"/>
     <link rel="icon" type="image/png" href="chrome://branding/content/favicon32.png" />
     <script type="application/javascript;version=1.8" src="chrome://browser/content/aboutPrivateBrowsing.js"></script>
   </head>
 
   <body class="private">
-    <img class="masq" src="chrome://browser/skin/images/privatebrowsing-mask.png" />
+    <img class="showPrivate masq" src="chrome://browser/skin/images/privatebrowsing-mask-and-shield.svg" />
+    <img class="showNormal masq" src="chrome://browser/skin/images/privatebrowsing-mask.png" />
 
-    <h1 class="showPrivate">&privatebrowsingpage.title;</h1>
+    <h1 class="showPrivate">&privatebrowsingpage.title;<br />&privatebrowsingpage.title.private;</h1>
     <h1 class="showNormal">&privatebrowsingpage.title.normal;</h1>
 
     <div class="contentSection">
-      <p class="showPrivate">&privatebrowsingpage.description.private2;</p>
-      <p class="showNormal">&privatebrowsingpage.description.normal;</p>
+      <p class="showPrivate">&privatebrowsingpage.description.private3;</p>
+      <p class="showNormal">&privatebrowsingpage.description.normal1;</p>
 
       <p class="showPrivate"><a href="https://support.mozilla.org/kb/private-browsing-firefox-android">&privatebrowsingpage.link.private;</a></p>
       <p class="showNormal"><a href="#" id="newPrivateTabLink">&privatebrowsingpage.link.normal;</a></p>
     </div>
 
   </body>
 </html>
--- a/mobile/android/locales/en-US/chrome/aboutPrivateBrowsing.dtd
+++ b/mobile/android/locales/en-US/chrome/aboutPrivateBrowsing.dtd
@@ -1,16 +1,17 @@
 <!-- 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/. -->
 
 <!ENTITY privatebrowsingpage.title "Private Browsing">
+
+<!-- Localisation note: the plus sign here is a shorthand way of expressing the word "and". Contextually the privatebrowsingpage.title.private string
+                        is used as a title, with the privatebrowsingpage.title string preceding it but on a separate line.
+                        So the final line will say "Private Browsing + Tracking Protection". -->
+<!ENTITY privatebrowsingpage.title.private "+ Tracking Protection">
 <!ENTITY privatebrowsingpage.title.normal "You are not in private browsing">
 
-<!ENTITY privatebrowsingpage.issueDesc.normal2 "In private browsing, we won't keep any of your browsing history or cookies.">
-<!ENTITY privatebrowsingpage.issueDesc.private2 "We won't keep any of your browsing history or cookies.">
-
-<!ENTITY privatebrowsingpage.description2 "Bookmarks you add and files you download will still be saved on your device.">
-<!ENTITY privatebrowsingpage.description.normal "&privatebrowsingpage.issueDesc.normal2; &privatebrowsingpage.description2;">
-<!ENTITY privatebrowsingpage.description.private2 "&privatebrowsingpage.issueDesc.private2; &privatebrowsingpage.description2;">
+<!ENTITY privatebrowsingpage.description.private3 "Firefox will prevent you from being tracked and won't remember any history, but downloaded files and new bookmarks will still be saved to your device.">
+<!ENTITY privatebrowsingpage.description.normal1 "In private browsing, we won't keep any of your browsing history or cookies. Bookmarks you add and files you download will still be saved on your device.">
 
 <!ENTITY privatebrowsingpage.link.private "Want to learn more?">
 <!ENTITY privatebrowsingpage.link.normal "Open a new private tab">
--- a/mobile/android/themes/core/aboutPrivateBrowsing.css
+++ b/mobile/android/themes/core/aboutPrivateBrowsing.css
@@ -15,17 +15,17 @@ body.private .showNormal {
 }
 
 div.contentSection {
   max-width: 400px;
   margin:auto;
 }
 
 body.private {
-  background-color: #45494E; /* tabs_tray_grey_pressed */
+  background-color: #363b40; /* text_and_tabs_tray_grey */
   color: #afb1b3; /* tabs_tray_icon_grey */
 }
 
 body.normal {
   background-color: #eeeeee;
   color: #777777; /* placeholder gray */
 }
 
@@ -42,36 +42,43 @@ body.normal h1 {
 
 a {
   color: #0096DD; /* link_blue */
   text-decoration: none;
 }
 
 .masq {
   display: block;
-  width: 80px;
   height: auto;
   margin: 0 auto 20px auto;
 }
 
+.masq.showNormal {
+  width: 80px;
+}
+
+.masq.showPrivate {
+  width: 160px;
+}
+
 @media all and (max-height: 399px) {
   body {
     margin-top: 30px;
   }
 }
 
 @media all and (min-height: 400px) and (max-height: 599px) {
   body {
     margin-top: 60px;
   }
 }
 
 @media all and (min-height: 600px) and (max-height: 799px) {
   body {
-    margin-top: 150px;
+    margin-top: 120px;
   }
 }
 
 @media all and (min-height: 800px) {
   body {
-    margin-top: 250px;
+    margin-top: 240px;
   }
 }
new file mode 100644
--- /dev/null
+++ b/mobile/android/themes/core/images/privatebrowsing-mask-and-shield.svg
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- 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/. -->
+
+<svg width="400" height="138" viewBox="0 0 400 138" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs>
+    <path d="M72.29 136.64C28.48 137.22 0.29 72.46 0.29 41.98L0.29 4.65C7.14 11.12 24.29 17.93 44.86 11.31 65.43 0.89 99.71-5.92 120.29 7.31 140.86-5.92 175.14 0.89 195.71 11.31 216.29 17.93 233.43 11.12 240.29 4.65L240.29 41.98C240.29 72.46 212.1 137.22 168.29 136.64 140.85 136.28 130.57 130.36 120.29 129.98 110 130.36 99.73 136.28 72.29 136.64ZM100.28 85.11C100.12 75.55 100.11 58.19 76.48 54.7 52.63 51.25 42.46 61.67 32.28 61.46 32.28 79.03 66.2 92.91 100.28 85.11ZM140.28 85.11C140.45 75.55 140.46 58.19 164.08 54.7 187.93 51.25 198.11 61.67 208.28 61.46 208.28 79.03 174.36 92.91 140.28 85.11Z" id="path-1"/>
+  </defs>
+  <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="XXHDPI" transform="translate(-178.000000, -1050.000000)">
+      <g id="graphic-2" transform="translate(178.000000, 1050.901172)">
+        <path d="M399.38 24.32C399.36 19.92 396.45 16.4 392.71 15.32L349.86 8.32 307 15.32C303.26 16.4 300.35 19.92 300.33 24.32 300.31 34.22 300.37 52.28 301.29 60.32 303.17 83.36 307.43 94.81 317.48 108.32 330.16 126.08 349.86 128.32 349.86 128.32 349.86 128.32 369.56 126.08 382.24 108.32 392.28 94.81 396.54 83.36 398.43 60.32 399.34 52.28 399.4 34.22 399.38 24.32L399.38 24.32 399.38 24.32ZM390.81 59.32C388.95 82.65 384.72 92.07 376.52 103.32 367.16 116.27 353.36 119.66 349.86 120.32 346.31 119.65 332.54 116.26 323.19 103.32 314.99 92.07 310.76 82.65 308.9 59.32 308.17 53.88 307.91 40.97 307.95 24.32 307.96 23.78 308.17 23.56 308.9 23.32L349.86 16.32 390.81 23.32C391.54 23.56 391.75 23.78 391.76 24.32 391.8 40.96 391.54 53.87 390.81 59.32ZM326.05 98.32C318.68 87.15 315.78 78.92 314.62 59.32 313.99 54.06 313.66 45.26 313.67 30.32L348.9 23.32 348.9 113.32C344.72 112.4 334.23 108.99 326.05 98.32Z" id="XXHDPI" fill="#FFFFFF"/>
+        <g id="Path-Copy">
+          <use fill="none" xlink:href="#path-1"/>
+          <use fill="none" xlink:href="#path-1"/>
+          <use fill="#5F6368" fill-rule="evenodd" xlink:href="#path-1"/>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
--- a/mobile/android/themes/core/jar.mn
+++ b/mobile/android/themes/core/jar.mn
@@ -114,16 +114,17 @@ chrome.jar:
   skin/images/reader-style-icon-active-hdpi.png  (images/reader-style-icon-active-hdpi.png)
   skin/images/reader-style-icon-active-xhdpi.png (images/reader-style-icon-active-xhdpi.png)
   skin/images/reader-style-icon-active-xxhdpi.png (images/reader-style-icon-active-xxhdpi.png)
   skin/images/reader-style-icon-mdpi.png         (images/reader-style-icon-mdpi.png)
   skin/images/reader-style-icon-hdpi.png         (images/reader-style-icon-hdpi.png)
   skin/images/reader-style-icon-xhdpi.png        (images/reader-style-icon-xhdpi.png)
   skin/images/reader-style-icon-xxhdpi.png       (images/reader-style-icon-xxhdpi.png)
   skin/images/privatebrowsing-mask.png           (images/privatebrowsing-mask.png)
+  skin/images/privatebrowsing-mask-and-shield.svg (images/privatebrowsing-mask-and-shield.svg)
   skin/images/icon_floaty_hdpi.png               (images/icon_floaty_hdpi.png)
   skin/images/icon_floaty_mdpi.png               (images/icon_floaty_mdpi.png)
   skin/images/icon_floaty_xhdpi.png              (images/icon_floaty_xhdpi.png)
   skin/images/icon_floaty_xxhdpi.png             (images/icon_floaty_xxhdpi.png)
   skin/images/icon_heart_hdpi.png                (images/icon_heart_hdpi.png)
   skin/images/icon_heart_mdpi.png                (images/icon_heart_mdpi.png)
   skin/images/icon_heart_xhdpi.png               (images/icon_heart_xhdpi.png)
   skin/images/icon_heart_xxhdpi.png              (images/icon_heart_xxhdpi.png)