[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

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

To: tor-commits@xxxxxxxxxxxxxxxxxxxx, tbb-commits@xxxxxxxxxxxxxxxxxxxx
Subject: [tor-commits] [tor-browser/tor-browser-68.1.0esr-9.0-1] Bug 25741 - TBA: top sites changed, used bookmarks icon temporarily.
From: gk@xxxxxxxxxxxxxx
Date: Sat, 31 Aug 2019 19:46:16 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivery-date: Sat, 31 Aug 2019 15:48:15 -0400
List-archive: <http://lists.torproject.org/pipermail/tor-commits/>
List-help: <mailto:tor-commits-request@lists.torproject.org?subject=help>
List-id: "auto: code repository commits" <tor-commits.lists.torproject.org>
List-post: <mailto:tor-commits@lists.torproject.org>
List-subscribe: <https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=subscribe>
List-unsubscribe: <https://lists.torproject.org/cgi-bin/mailman/options/tor-commits>, <mailto:tor-commits-request@lists.torproject.org?subject=unsubscribe>
Patch-author: Amogh Pradeep <amoghbl1@xxxxxxxxx>
Sender: "tor-commits" <tor-commits-bounces@xxxxxxxxxxxxxxxxxxxx>

commit 5e45176359a9131f70254e2b02af01bcd66f46c8
Author: Amogh Pradeep <amoghbl1@xxxxxxxxx>
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@xxxxxxxxx>
---
 .../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 +++
 .../components/search/searchplugins/duckduckgo.xml |   6 ++---
 .../components/search/searchplugins/list.json      |  26 +++++++++++++++---
 mobile/locales/en-US/chrome/region.properties      |  30 +++++++++++++--------
 13 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/mobile/android/app/src/main/res/drawable-hdpi/suggestedsites_checktor.png b/mobile/android/app/src/main/res/drawable-hdpi/suggestedsites_checktor.png
new file mode 100644
index 000000000000..a87c16e3d566
Binary files /dev/null and b/mobile/android/app/src/main/res/drawable-hdpi/suggestedsites_checktor.png differ
diff --git a/mobile/android/app/src/main/res/drawable-hdpi/suggestedsites_guardianproject.png b/mobile/android/app/src/main/res/drawable-hdpi/suggestedsites_guardianproject.png
new file mode 100644
index 000000000000..a87c16e3d566
Binary files /dev/null and b/mobile/android/app/src/main/res/drawable-hdpi/suggestedsites_guardianproject.png differ
diff --git a/mobile/android/app/src/main/res/drawable-hdpi/suggestedsites_torproject.png b/mobile/android/app/src/main/res/drawable-hdpi/suggestedsites_torproject.png
new file mode 100644
index 000000000000..a87c16e3d566
Binary files /dev/null and b/mobile/android/app/src/main/res/drawable-hdpi/suggestedsites_torproject.png differ
diff --git a/mobile/android/app/src/main/res/drawable-xhdpi/suggestedsites_checktor.png b/mobile/android/app/src/main/res/drawable-xhdpi/suggestedsites_checktor.png
new file mode 100644
index 000000000000..fa7f676310df
Binary files /dev/null and b/mobile/android/app/src/main/res/drawable-xhdpi/suggestedsites_checktor.png differ
diff --git a/mobile/android/app/src/main/res/drawable-xhdpi/suggestedsites_guardianproject.png b/mobile/android/app/src/main/res/drawable-xhdpi/suggestedsites_guardianproject.png
new file mode 100644
index 000000000000..fa7f676310df
Binary files /dev/null and b/mobile/android/app/src/main/res/drawable-xhdpi/suggestedsites_guardianproject.png differ
diff --git a/mobile/android/app/src/main/res/drawable-xhdpi/suggestedsites_torproject.png b/mobile/android/app/src/main/res/drawable-xhdpi/suggestedsites_torproject.png
new file mode 100644
index 000000000000..fa7f676310df
Binary files /dev/null and b/mobile/android/app/src/main/res/drawable-xhdpi/suggestedsites_torproject.png differ
diff --git a/mobile/android/app/src/main/res/drawable-xxhdpi/suggestedsites_checktor.png b/mobile/android/app/src/main/res/drawable-xxhdpi/suggestedsites_checktor.png
new file mode 100644
index 000000000000..fa7f676310df
Binary files /dev/null and b/mobile/android/app/src/main/res/drawable-xxhdpi/suggestedsites_checktor.png differ
diff --git a/mobile/android/app/src/main/res/drawable-xxhdpi/suggestedsites_guardianproject.png b/mobile/android/app/src/main/res/drawable-xxhdpi/suggestedsites_guardianproject.png
new file mode 100644
index 000000000000..fa7f676310df
Binary files /dev/null and b/mobile/android/app/src/main/res/drawable-xxhdpi/suggestedsites_guardianproject.png differ
diff --git a/mobile/android/app/src/main/res/drawable-xxhdpi/suggestedsites_torproject.png b/mobile/android/app/src/main/res/drawable-xxhdpi/suggestedsites_torproject.png
new file mode 100644
index 000000000000..fa7f676310df
Binary files /dev/null and b/mobile/android/app/src/main/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 4056bd1a2ba5..af21ca27aadf 100644
--- a/mobile/android/base/java/org/mozilla/gecko/util/UnusedResourcesUtil.java
+++ b/mobile/android/base/java/org/mozilla/gecko/util/UnusedResourcesUtil.java
@@ -62,10 +62,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/android/components/search/searchplugins/duckduckgo.xml b/mobile/android/components/search/searchplugins/duckduckgo.xml
index 2e5d1d2802c4..9ff1b91a027a 100644
--- a/mobile/android/components/search/searchplugins/duckduckgo.xml
+++ b/mobile/android/components/search/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>
diff --git a/mobile/android/components/search/searchplugins/list.json b/mobile/android/components/search/searchplugins/list.json
index 587a3ccba7ad..008039f48e01 100644
--- a/mobile/android/components/search/searchplugins/list.json
+++ b/mobile/android/components/search/searchplugins/list.json
@@ -1,14 +1,32 @@
 {
   "default": {
-    "searchDefault": "Google",
-    "searchOrder": ["Google", "Bing"],
+    "searchDefault": "DuckDuckGo",
+    "searchOrder": ["DuckDuckGo", "Google"],
     "visibleDefaultEngines": [
-      "google-b-m", "bing", "amazondotcom", "ddg", "twitter", "wikipedia"
+      "ddg", "google", "bing", "amazondotcom", "twitter", "wikipedia"
     ]
   },
   "regionOverrides": {
     "US": {
-      "google-b-m": "google-b-1-m"
+      "ddg": "duckduckgo"
+    },
+    "KZ": {
+      "ddg": "duckduckgo"
+    },
+    "BY": {
+      "ddg": "duckduckgo"
+    },
+    "RU": {
+      "ddg": "duckduckgo"
+    },
+    "TR": {
+      "ddg": "duckduckgo"
+    },
+    "UA": {
+      "ddg": "duckduckgo"
+    },
+    "CN": {
+      "ddg": "duckduckgo"
     }
   },
   "locales": {
diff --git a/mobile/locales/en-US/chrome/region.properties b/mobile/locales/en-US/chrome/region.properties
index a392e1f2fc5a..861c0ee495e3 100644
--- a/mobile/locales/en-US/chrome/region.properties
+++ b/mobile/locales/en-US/chrome/region.properties
@@ -27,19 +27,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



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Prev by Author: [tor-commits] [tor-browser-build/master] Bug 30490: Add cbindgen project for building Firefox 68 ESR
Next by Author: [tor-commits] [tor-browser-build/master] Remove search engines from language packs
Previous by thread: [tor-commits] [tor-browser/tor-browser-68.1.0esr-9.0-1] Bug 25741 - TBA: Disable all data reporting by default
Next by thread: [tor-commits] [tor-browser/tor-browser-68.1.0esr-9.0-1] Bug 25741 - TBA: Always Quit, do not restore the last session
Index(es):
- Author
- Thread