[tbb-commits] [tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: top sites changed, used bookmarks icon temporarily.

gk at torproject.org gk at torproject.org
Fri Jul 27 08:37:27 UTC 2018


commit 74da90a39fc0c6f8c5b1a78025b3da514707deaa
Author: Amogh Pradeep <amoghbl1 at gmail.com>
Date:   Thu Jun 18 04:14:18 2015 -0400

    Bug 25741 - TBA: top sites changed, used bookmarks icon temporarily.
    
    Adjust the Top Sites shown when a user taps on the URL bar.
    
    Signed-off-by: Amogh Pradeep <amoghbl1 at gmail.com>
---
 .../res/drawable-hdpi/suggestedsites_checktor.png  | Bin 0 -> 1286 bytes
 .../suggestedsites_guardianproject.png             | Bin 0 -> 1286 bytes
 .../drawable-hdpi/suggestedsites_torproject.png    | Bin 0 -> 1286 bytes
 .../res/drawable-xhdpi/suggestedsites_checktor.png | Bin 0 -> 1626 bytes
 .../suggestedsites_guardianproject.png             | Bin 0 -> 1626 bytes
 .../drawable-xhdpi/suggestedsites_torproject.png   | Bin 0 -> 1626 bytes
 .../drawable-xxhdpi/suggestedsites_checktor.png    | Bin 0 -> 1626 bytes
 .../suggestedsites_guardianproject.png             | Bin 0 -> 1626 bytes
 .../drawable-xxhdpi/suggestedsites_torproject.png  | Bin 0 -> 1626 bytes
 .../mozilla/gecko/util/UnusedResourcesUtil.java    |   3 ++
 mobile/locales/en-US/chrome/region.properties      |  42 ++++++++++++---------
 mobile/locales/search/list.json                    |  16 ++++----
 mobile/locales/searchplugins/duckduckgo.xml        |   6 +--
 13 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/mobile/android/app/src/photon/res/drawable-hdpi/suggestedsites_checktor.png b/mobile/android/app/src/photon/res/drawable-hdpi/suggestedsites_checktor.png
new file mode 100644
index 000000000000..a87c16e3d566
Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-hdpi/suggestedsites_checktor.png differ
diff --git a/mobile/android/app/src/photon/res/drawable-hdpi/suggestedsites_guardianproject.png b/mobile/android/app/src/photon/res/drawable-hdpi/suggestedsites_guardianproject.png
new file mode 100644
index 000000000000..a87c16e3d566
Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-hdpi/suggestedsites_guardianproject.png differ
diff --git a/mobile/android/app/src/photon/res/drawable-hdpi/suggestedsites_torproject.png b/mobile/android/app/src/photon/res/drawable-hdpi/suggestedsites_torproject.png
new file mode 100644
index 000000000000..a87c16e3d566
Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-hdpi/suggestedsites_torproject.png differ
diff --git a/mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_checktor.png b/mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_checktor.png
new file mode 100644
index 000000000000..fa7f676310df
Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_checktor.png differ
diff --git a/mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_guardianproject.png b/mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_guardianproject.png
new file mode 100644
index 000000000000..fa7f676310df
Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_guardianproject.png differ
diff --git a/mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_torproject.png b/mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_torproject.png
new file mode 100644
index 000000000000..fa7f676310df
Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-xhdpi/suggestedsites_torproject.png differ
diff --git a/mobile/android/app/src/photon/res/drawable-xxhdpi/suggestedsites_checktor.png b/mobile/android/app/src/photon/res/drawable-xxhdpi/suggestedsites_checktor.png
new file mode 100644
index 000000000000..fa7f676310df
Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-xxhdpi/suggestedsites_checktor.png differ
diff --git a/mobile/android/app/src/photon/res/drawable-xxhdpi/suggestedsites_guardianproject.png b/mobile/android/app/src/photon/res/drawable-xxhdpi/suggestedsites_guardianproject.png
new file mode 100644
index 000000000000..fa7f676310df
Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-xxhdpi/suggestedsites_guardianproject.png differ
diff --git a/mobile/android/app/src/photon/res/drawable-xxhdpi/suggestedsites_torproject.png b/mobile/android/app/src/photon/res/drawable-xxhdpi/suggestedsites_torproject.png
new file mode 100644
index 000000000000..fa7f676310df
Binary files /dev/null and b/mobile/android/app/src/photon/res/drawable-xxhdpi/suggestedsites_torproject.png differ
diff --git a/mobile/android/base/java/org/mozilla/gecko/util/UnusedResourcesUtil.java b/mobile/android/base/java/org/mozilla/gecko/util/UnusedResourcesUtil.java
index 8f68e29ba069..7ed717b6fd3d 100644
--- a/mobile/android/base/java/org/mozilla/gecko/util/UnusedResourcesUtil.java
+++ b/mobile/android/base/java/org/mozilla/gecko/util/UnusedResourcesUtil.java
@@ -63,10 +63,13 @@ final class UnusedResourcesUtil {
 
     public static final int[] USED_IN_SUGGESTEDSITES = {
             R.drawable.suggestedsites_amazon,
+            R.drawable.suggestedsites_checktor,
             R.drawable.suggestedsites_facebook,
+            R.drawable.suggestedsites_guardianproject,
             R.drawable.suggestedsites_restricted_fxsupport,
             R.drawable.suggestedsites_restricted_mozilla,
             R.drawable.suggestedsites_twitter,
+            R.drawable.suggestedsites_torproject,
             R.drawable.suggestedsites_webmaker,
             R.drawable.suggestedsites_wikipedia,
             R.drawable.suggestedsites_youtube,
diff --git a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US/chrome/region.properties
index 79c819c02cd1..1cc4d64ebf05 100644
--- a/mobile/locales/en-US/chrome/region.properties
+++ b/mobile/locales/en-US/chrome/region.properties
@@ -3,17 +3,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Default search engine
-browser.search.defaultenginename=Google
+browser.search.defaultenginename=DuckDuckGo
 
 # Search engine order (order displayed in the search bar dropdown).
-browser.search.order.1=Google
-browser.search.order.2=Bing
+browser.search.order.1=DuckDuckGo
+browser.search.order.2=Google
 
 # These override the equivalents above when the client detects that it is in
 # US market only.
-browser.search.defaultenginename.US=Google
-browser.search.order.US.1=Google
-browser.search.order.US.2=Bing
+browser.search.defaultenginename.US=DuckDuckGo
+browser.search.order.US.1=DuckDuckGo
+browser.search.order.US.2=Google
 
 # increment this number when anything gets changed in the list below.  This will
 # cause Firefox to re-read these prefs and inject any new handlers into the
@@ -44,19 +44,27 @@ browser.contentHandlers.types.0.uri=https://add.my.yahoo.com/rss?url=%s
 # browser.suggestedsites.NAME.title=Displayed name
 # browser.suggestedsites.NAME.url=Website URL
 # browser.suggestedsites.NAME.bgcolor= Color (hex format)
-#
-# Note that if you remove or add items to this set, you need to adjust
-# mobile/android/tests/browser/robocop/testDistribution.java
-# to reflect the new set of IDs reported as tiles data.
-#
-browser.suggestedsites.list.0=facebook
-browser.suggestedsites.list.1=youtube
-browser.suggestedsites.list.2=amazon
+
+browser.suggestedsites.list.0=checktor
+browser.suggestedsites.list.1=torproject
+browser.suggestedsites.list.2=guardianproject
 browser.suggestedsites.list.3=wikipedia
-browser.suggestedsites.list.4=twitter
+browser.suggestedsites.list.4=facebook
+
+browser.suggestedsites.checktor.title=Check Tor Connection
+browser.suggestedsites.checktor.url=https://check.torproject.org/
+browser.suggestedsites.checktor.bgcolor=#ffecf0f3
+
+browser.suggestedsites.torproject.title=The Tor Project
+browser.suggestedsites.torproject.url=https://www.torproject.org/
+browser.suggestedsites.torproject.bgcolor=#ffecf0f3
+
+browser.suggestedsites.guardianproject.title=The Guardian Project
+browser.suggestedsites.guardianproject.url=https://guardianproject.info/
+browser.suggestedsites.guardianproject.bgcolor=#ffecf0f3
 
-browser.suggestedsites.facebook.title=Facebook
-browser.suggestedsites.facebook.url=https://m.facebook.com/
+browser.suggestedsites.facebook.title=Facebook Onion Service
+browser.suggestedsites.facebook.url=https://m.facebookcorewwwi.onion
 browser.suggestedsites.facebook.bgcolor=#3B5998
 
 browser.suggestedsites.youtube.title=YouTube
diff --git a/mobile/locales/search/list.json b/mobile/locales/search/list.json
index 4c490568579c..a0ee93d4f7f7 100644
--- a/mobile/locales/search/list.json
+++ b/mobile/locales/search/list.json
@@ -1,30 +1,30 @@
 {
   "default": {
     "visibleDefaultEngines": [
-      "google", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
+      "ddg", "google", "bing", "amazondotcom", "twitter", "wikipedia"
     ]
   },
   "regionOverrides": {
     "US": {
-      "google": "google-2018"
+      "ddg": "duckduckgo"
     },
     "KZ": {
-      "google": "google-nocodes"
+      "ddg": "duckduckgo"
     },
     "BY": {
-      "google": "google-nocodes"
+      "ddg": "duckduckgo"
     },
     "RU": {
-      "google": "google-nocodes"
+      "ddg": "duckduckgo"
     },
     "TR": {
-      "google": "google-nocodes"
+      "ddg": "duckduckgo"
     },
     "UA": {
-      "google": "google-nocodes"
+      "ddg": "duckduckgo"
     },
     "CN": {
-      "google": "google-nocodes"
+      "ddg": "duckduckgo"
     }
   },
   "locales": {
diff --git a/mobile/locales/searchplugins/duckduckgo.xml b/mobile/locales/searchplugins/duckduckgo.xml
index 2e5d1d2802c4..9ff1b91a027a 100644
--- a/mobile/locales/searchplugins/duckduckgo.xml
+++ b/mobile/locales/searchplugins/duckduckgo.xml
@@ -11,13 +11,13 @@
   <Param name="type" value="list"/>
 </Url>
 <!-- this is effectively x-moz-phonesearch, but search service expects a text/html entry -->
-<Url type="text/html" method="GET" template="https://duckduckgo.com/">
+<Url type="text/html" method="GET" template="https://duckduckgo.com/html/">
   <Param name="q" value="{searchTerms}" />
   <Param name="t" value="fpas" />
 </Url>
-<Url type="application/x-moz-tabletsearch" method="GET" template="https://duckduckgo.com/">
+<Url type="application/x-moz-tabletsearch" method="GET" template="https://duckduckgo.com/html/">
   <Param name="q" value="{searchTerms}" />
   <Param name="t" value="ftas" />
 </Url>
-<SearchForm>https://duckduckgo.com</SearchForm>
+<SearchForm>https://duckduckgo.com/html/</SearchForm>
 </SearchPlugin>





More information about the tbb-commits mailing list