From: Soren Stoutner <soren@stoutner.com>
Date: Mon, 5 Sep 2016 21:28:16 +0000 (-0700)
Subject: Add StartPage and Qwant to the search engines list.
X-Git-Tag: v1.10~9
X-Git-Url: https://gitweb.stoutner.com/?a=commitdiff_plain;h=bead4e5c91f6d706559d923d9555a2b52c95b76d;p=PrivacyBrowserAndroid.git

Add StartPage and Qwant to the search engines list.
---

diff --git a/.idea/dictionaries/soren.xml b/.idea/dictionaries/soren.xml
index 47992f9b..d142454e 100644
--- a/.idea/dictionaries/soren.xml
+++ b/.idea/dictionaries/soren.xml
@@ -40,6 +40,7 @@
       <w>panopticlick</w>
       <w>parentfolder</w>
       <w>programatically</w>
+      <w>qwant</w>
       <w>radiobutton</w>
       <w>radiogroup</w>
       <w>redmine</w>
diff --git a/app/src/main/res/drawable/cookies_disabled.xml b/app/src/main/res/drawable/cookies_disabled.xml
index 8a1a5625..0e6dc4fa 100644
--- a/app/src/main/res/drawable/cookies_disabled.xml
+++ b/app/src/main/res/drawable/cookies_disabled.xml
@@ -1,11 +1,13 @@
-<!-- cookies_disabled.xml was created by Google and downloaded from https://materialdesignicons.com/icon/cookie. -->
+<!-- cookies_disabled.xml was created by Google and downloaded from https://materialdesignicons.com/icon/cookie.
+    It is released under the Apache License 2.0. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="26dp"
     android:width="26dp"
     android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
+    android:viewportWidth="24.0"
+    android:autoMirrored="true" >
 
     <!-- We have to use a hard coded color code until API >= 21.  Then we can use`@color`. -->
     <path
diff --git a/app/src/main/res/drawable/cookies_enabled.xml b/app/src/main/res/drawable/cookies_enabled.xml
index 20fed566..2ceaf127 100644
--- a/app/src/main/res/drawable/cookies_enabled.xml
+++ b/app/src/main/res/drawable/cookies_enabled.xml
@@ -1,11 +1,13 @@
-<!-- cookies_enabled.xml was created by Google and downloaded from https://materialdesignicons.com/icon/cookie. -->
+<!-- cookies_enabled.xml was created by Google and downloaded from https://materialdesignicons.com/icon/cookie.
+    It is released under the Apache License 2.0. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="24dp"
     android:width="24dp"
     android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
+    android:viewportWidth="24.0"
+    android:autoMirrored="true" >
 
     <!-- We have to use a hard coded color code until API >= 21.  Then we can use`@color`. -->
     <path
diff --git a/app/src/main/res/drawable/cookies_ghosted.xml b/app/src/main/res/drawable/cookies_ghosted.xml
index d05224c3..d5675b3f 100644
--- a/app/src/main/res/drawable/cookies_ghosted.xml
+++ b/app/src/main/res/drawable/cookies_ghosted.xml
@@ -1,11 +1,13 @@
-<!-- cookies_ghosted.xml was created by Google and downloaded from https://materialdesignicons.com/icon/cookie. -->
+<!-- cookies_ghosted.xml was created by Google and downloaded from https://materialdesignicons.com/icon/cookie.
+    It is released under the Apache License 2.0. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:height="26dp"
     android:width="26dp"
     android:viewportHeight="24.0"
-    android:viewportWidth="24.0" >
+    android:viewportWidth="24.0"
+    android:autoMirrored="true" >
 
     <!-- We have to use a hard coded color code until API >= 21.  Then we can use`@color`. -->
     <path
diff --git a/app/src/main/res/drawable/cookies_warning.xml b/app/src/main/res/drawable/cookies_warning.xml
index c68a9635..9fc93bc3 100644
--- a/app/src/main/res/drawable/cookies_warning.xml
+++ b/app/src/main/res/drawable/cookies_warning.xml
@@ -1,4 +1,5 @@
-<!-- cookies_warning.xml was created by Google and downloaded from https://materialdesignicons.com/icon/cookie. -->
+<!-- cookies_warning.xml was created by Google and downloaded from https://materialdesignicons.com/icon/cookie.
+    It is released under the Apache License 2.0. -->
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 70ce3bc0..aa3448f2 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -189,6 +189,8 @@
         <item>Google</item>
         <item>Bing</item>
         <item>Yahoo</item>
+        <item>StartPage</item>
+        <item>Qwant</item>
         <item>Eigene</item>
     </string-array>
     <string name="javascript_disabled_search_custom_url">Suchmaschinen-URL bei deaktiviertem JavaScript</string>
@@ -198,6 +200,8 @@
         <item>Google</item>
         <item>Bing</item>
         <item>Yahoo</item>
+        <item>StartPage</item>
+        <item>Qwant</item>
         <item>Eigene</item>
     </string-array>
     <string name="javascript_enabled_search_custom_url">Suchmaschinen-URL bei aktivertem JavaScript</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f0da49be..e1857534 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -210,6 +210,8 @@
         <item>Google</item>
         <item>Bing</item>
         <item>Yahoo</item>
+        <item>StartPage</item>
+        <item>Qwant</item>
         <item>Custom</item>
     </string-array>
     <string-array name="javascript_disabled_search_entry_values" translatable="false">  <!-- None of the items in this `string-array` should be translated. -->
@@ -217,6 +219,8 @@
         <item>https://www.google.com/search?q=</item>
         <item>https://www.bing.com/search?q=</item>
         <item>https://search.yahoo.com/mobile/s?nojs=1&amp;p=</item>
+        <item>https://www.startpage.com/do/search?q=</item>
+        <item>https://lite.qwant.com/?q=</item>
         <item>Custom URL</item>  <!-- This item must not be translated into other languages because it is referenced in code.  It is never displayed on the screen. -->
     </string-array>
     <string name="javascript_disabled_search_custom_url">JavaScript-disabled search custom URL</string>
@@ -226,6 +230,8 @@
         <item>Google</item>
         <item>Bing</item>
         <item>Yahoo</item>
+        <item>StartPage</item>
+        <item>Qwant</item>
         <item>Custom</item>
     </string-array>
     <string-array name="javascript_enabled_search_entry_values" translatable="false">  <!-- None of the items in this `string-array` should be translated. -->
@@ -233,6 +239,8 @@
         <item>https://www.google.com/search?q=</item>
         <item>https://www.bing.com/search?q=</item>
         <item>https://search.yahoo.com/mobile/s?p=</item>
+        <item>https://www.startpage.com/do/search?q=</item>
+        <item>https://www.qwant.com/?q=</item>
         <item>Custom URL</item>  <!-- This item must not be translated into other languages because it is referenced in code.  It is never displayed on the screen. -->
     </string-array>
     <string name="javascript_enabled_search_custom_url">JavaScript-enabled search custom URL</string>