Bug 1554071 - Added support for Enhanced Tracking Protection. r=esawin, a=RyanVM, l10n=flod DEVEDITION_69_0b5_BUILD1 DEVEDITION_69_0b5_RELEASE FIREFOX_69_0b5_BUILD1 FIREFOX_69_0b5_RELEASE
authorAndrei Lazar <andrei.a.lazar@softvision.ro>
Tue, 09 Jul 2019 12:38:06 +0000
changeset 544555 e5d98eda2ec359a0968c567076b1a625cb6c99ce
parent 544554 b0cc801fe229051418ccfba5c5ed9b8f5bba710c
child 544556 5afe44976df8d8f460b21cbc928391cc1da7ae48
push id2131
push userffxbld-merge
push dateMon, 26 Aug 2019 18:30:20 +0000
treeherdermozilla-release@b19ffb3ca153 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersesawin, RyanVM
bugs1554071
milestone69.0
Bug 1554071 - Added support for Enhanced Tracking Protection. r=esawin, a=RyanVM, l10n=flod Exposed "Enabled, excluding tracking cookies" Cookie behavior option. Differential Revision: https://phabricator.services.mozilla.com/D35316
mobile/android/app/src/main/res/values/arrays.xml
mobile/android/base/locales/en-US/android_strings.dtd
mobile/android/base/strings.xml.in
--- a/mobile/android/app/src/main/res/values/arrays.xml
+++ b/mobile/android/app/src/main/res/values/arrays.xml
@@ -18,31 +18,33 @@
         <item>@string/pref_char_encoding_off</item>
     </string-array>
     <string-array name="pref_char_encoding_values">
         <item>true</item>
         <item>false</item>
     </string-array>
     <string-array name="pref_cookies_entries">
         <item>@string/pref_cookies_accept_all</item>
+        <item>@string/pref_cookies_not_accept_trackers</item>
         <item>@string/pref_cookies_not_accept_foreign</item>
         <item>@string/pref_cookies_disabled</item>
     </string-array>
     <string-array name="pref_tracking_protection_values">
         <item>2</item>
         <item>1</item>
         <item>0</item>
     </string-array>
     <string-array name="pref_tracking_protection_entries">
         <item>@string/pref_tracking_protection_enabled</item>
         <item>@string/pref_tracking_protection_enabled_pb</item>
         <item>@string/pref_tracking_protection_disabled</item>
     </string-array>
     <string-array name="pref_cookies_values">
         <item>0</item>
+        <item>4</item>
         <item>1</item>
         <item>2</item>
     </string-array>
     <string-array name="pref_import_android_entries">
         <item>@string/bookmarks_title</item>
         <item>@string/history_title</item>
     </string-array>
     <string-array name="pref_import_android_defaults">
--- a/mobile/android/base/locales/en-US/android_strings.dtd
+++ b/mobile/android/base/locales/en-US/android_strings.dtd
@@ -273,16 +273,17 @@
 <!ENTITY pref_header_notifications "Notifications">
 <!ENTITY pref_header_advanced "Advanced">
 <!ENTITY pref_header_help "Help">
 <!ENTITY pref_header_vendor "&vendorShortName;">
 
 <!ENTITY pref_cookies_menu "Cookies">
 <!ENTITY pref_cookies_accept_all "Enabled">
 <!ENTITY pref_cookies_not_accept_foreign "Enabled, excluding 3rd party">
+<!ENTITY pref_cookies_not_accept_trackers "Enabled, excluding tracking cookies">
 <!ENTITY pref_cookies_disabled "Disabled">
 
 <!-- Localization note (pref_category_data_saver): “data saver” in this
      context means consuming less data, e.g. by not loading images, not
      “storing data”. -->
 <!ENTITY pref_category_data_saver "Data saver">
 <!ENTITY pref_category_media "Media">
 <!ENTITY pref_category_developer_tools "Developer tools">
--- a/mobile/android/base/strings.xml.in
+++ b/mobile/android/base/strings.xml.in
@@ -209,16 +209,17 @@
 
   <string name="pref_remember_signons">&pref_remember_signons2;</string>
 
   <string name="pref_manage_logins">&pref_manage_logins;</string>
 
   <string name="pref_cookies_menu">&pref_cookies_menu;</string>
   <string name="pref_cookies_accept_all">&pref_cookies_accept_all;</string>
   <string name="pref_cookies_not_accept_foreign">&pref_cookies_not_accept_foreign;</string>
+  <string name="pref_cookies_not_accept_trackers">&pref_cookies_not_accept_trackers;</string>
   <string name="pref_cookies_disabled">&pref_cookies_disabled;</string>
 
   <string name="pref_category_data_saver">&pref_category_data_saver;</string>
   <string name="pref_category_media">&pref_category_media;</string>
   <string name="pref_category_developer_tools">&pref_category_developer_tools;</string>
 
   <string name="pref_tap_to_load_images_title2">&pref_tap_to_load_images_title2;</string>
   <string name="pref_tap_to_load_images_enabled">&pref_tap_to_load_images_enabled;</string>