summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kocialkowski <contact@paulk.fr>2014-07-02 20:09:27 +0200
committerPaul Kocialkowski <contact@paulk.fr>2014-07-02 20:12:38 +0200
commit47164dd38df598b39426eca5f972e5544ef6e7f7 (patch)
tree6d640250602d887cf1cca0181749eb2d60460149
parent72806ebcce7f31d1aaa55f5f50c4f62d7dfd99ef (diff)
downloadpackages_apps_browser-47164dd38df598b39426eca5f972e5544ef6e7f7.zip
packages_apps_browser-47164dd38df598b39426eca5f972e5544ef6e7f7.tar.gz
packages_apps_browser-47164dd38df598b39426eca5f972e5544ef6e7f7.tar.bz2
Possibility to disable the search engine and DuckDuckGo for all!replicant-4.2-0002
Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
-rw-r--r--res/values-cs-rCZ/donottranslate-search_engines.xml2
-rw-r--r--res/values-da-rDK/donottranslate-search_engines.xml2
-rw-r--r--res/values-de-rAT/donottranslate-search_engines.xml2
-rw-r--r--res/values-de-rCH/donottranslate-search_engines.xml2
-rw-r--r--res/values-de-rDE/donottranslate-search_engines.xml2
-rw-r--r--res/values-el-rGR/donottranslate-search_engines.xml2
-rw-r--r--res/values-en-rAU/donottranslate-search_engines.xml2
-rw-r--r--res/values-en-rGB/donottranslate-search_engines.xml5
-rw-r--r--res/values-en-rIE/donottranslate-search_engines.xml2
-rw-r--r--res/values-en-rNZ/donottranslate-search_engines.xml2
-rw-r--r--res/values-en-rSG/donottranslate-search_engines.xml2
-rw-r--r--res/values-en-rZA/donottranslate-search_engines.xml2
-rw-r--r--res/values-es-rES/donottranslate-search_engines.xml2
-rw-r--r--res/values-fr-rBE/donottranslate-search_engines.xml2
-rw-r--r--res/values-fr-rFR/donottranslate-search_engines.xml2
-rw-r--r--res/values-it-rIT/donottranslate-search_engines.xml2
-rw-r--r--res/values-ja-rJP/donottranslate-search_engines.xml2
-rw-r--r--res/values-ko-rKR/donottranslate-search_engines.xml2
-rw-r--r--res/values-nb-rNO/donottranslate-search_engines.xml2
-rw-r--r--res/values-nl-rBE/donottranslate-search_engines.xml2
-rw-r--r--res/values-nl-rNL/donottranslate-search_engines.xml2
-rw-r--r--res/values-nl/donottranslate-search_engines.xml3
-rw-r--r--res/values-pl-rPL/donottranslate-search_engines.xml2
-rw-r--r--res/values-pt-rBR/donottranslate-search_engines.xml2
-rw-r--r--res/values-pt-rPT/donottranslate-search_engines.xml2
-rw-r--r--res/values-ru-rRU/donottranslate-search_engines.xml2
-rw-r--r--res/values-sv-rSE/donottranslate-search_engines.xml2
-rw-r--r--res/values-tr-rTR/donottranslate-search_engines.xml2
-rw-r--r--res/values-zh-rCN/donottranslate-search_engines.xml2
-rw-r--r--res/values-zh-rHK/donottranslate-search_engines.xml2
-rw-r--r--res/values-zh-rTW/donottranslate-search_engines.xml2
-rw-r--r--res/values/all_search_engines.xml8
-rw-r--r--res/values/donottranslate-search_engines.xml3
-rw-r--r--src/com/android/browser/search/SearchEngineInfo.java3
34 files changed, 73 insertions, 7 deletions
diff --git a/res/values-cs-rCZ/donottranslate-search_engines.xml b/res/values-cs-rCZ/donottranslate-search_engines.xml
index 5aea8c8..f2525fc 100644
--- a/res/values-cs-rCZ/donottranslate-search_engines.xml
+++ b/res/values-cs-rCZ/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>seznam</item>
<item>bing_cs_CZ</item>
diff --git a/res/values-da-rDK/donottranslate-search_engines.xml b/res/values-da-rDK/donottranslate-search_engines.xml
index 73360b1..936fdb8 100644
--- a/res/values-da-rDK/donottranslate-search_engines.xml
+++ b/res/values-da-rDK/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>bing_da_DK</item>
<item>yahoo_dk</item>
diff --git a/res/values-de-rAT/donottranslate-search_engines.xml b/res/values-de-rAT/donottranslate-search_engines.xml
index 708d7ed..2220710 100644
--- a/res/values-de-rAT/donottranslate-search_engines.xml
+++ b/res/values-de-rAT/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>yahoo_at</item>
<item>bing_de_AT</item>
diff --git a/res/values-de-rCH/donottranslate-search_engines.xml b/res/values-de-rCH/donottranslate-search_engines.xml
index 4e2360e..38592f7 100644
--- a/res/values-de-rCH/donottranslate-search_engines.xml
+++ b/res/values-de-rCH/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>yahoo_ch</item>
<item>bing_de_CH</item>
diff --git a/res/values-de-rDE/donottranslate-search_engines.xml b/res/values-de-rDE/donottranslate-search_engines.xml
index 5fdde69..ddb101a 100644
--- a/res/values-de-rDE/donottranslate-search_engines.xml
+++ b/res/values-de-rDE/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>ask_de</item>
<item>bing_de_DE</item>
diff --git a/res/values-el-rGR/donottranslate-search_engines.xml b/res/values-el-rGR/donottranslate-search_engines.xml
index 8185cf3..fc0cd2c 100644
--- a/res/values-el-rGR/donottranslate-search_engines.xml
+++ b/res/values-el-rGR/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>yahoo</item>
<item>in</item>
diff --git a/res/values-en-rAU/donottranslate-search_engines.xml b/res/values-en-rAU/donottranslate-search_engines.xml
index 08765ac..e5742be 100644
--- a/res/values-en-rAU/donottranslate-search_engines.xml
+++ b/res/values-en-rAU/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>bing_en_AU</item>
<item>yahoo_au</item>
diff --git a/res/values-en-rGB/donottranslate-search_engines.xml b/res/values-en-rGB/donottranslate-search_engines.xml
index b82f101..5fab314 100644
--- a/res/values-en-rGB/donottranslate-search_engines.xml
+++ b/res/values-en-rGB/donottranslate-search_engines.xml
@@ -22,11 +22,12 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
+ <item>duckduckgo_en_gb</item>
<item>google</item>
<item>ask_uk</item>
<item>yahoo_uk</item>
<item>bing_en_GB</item>
- <item>duckduckgo</item>
- <item>duckduckgo_en_gb</item>
</string-array>
</resources>
diff --git a/res/values-en-rIE/donottranslate-search_engines.xml b/res/values-en-rIE/donottranslate-search_engines.xml
index 25f3f29..56666bf 100644
--- a/res/values-en-rIE/donottranslate-search_engines.xml
+++ b/res/values-en-rIE/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>yahoo_uk</item>
<item>bing_en_IE</item>
diff --git a/res/values-en-rNZ/donottranslate-search_engines.xml b/res/values-en-rNZ/donottranslate-search_engines.xml
index 2044c37..dd20ed5 100644
--- a/res/values-en-rNZ/donottranslate-search_engines.xml
+++ b/res/values-en-rNZ/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>yahoo_nz</item>
<item>bing_en_NZ</item>
diff --git a/res/values-en-rSG/donottranslate-search_engines.xml b/res/values-en-rSG/donottranslate-search_engines.xml
index 74d6939..2b7d7a3 100644
--- a/res/values-en-rSG/donottranslate-search_engines.xml
+++ b/res/values-en-rSG/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>yahoo_sg</item>
<item>bing_en_SG</item>
diff --git a/res/values-en-rZA/donottranslate-search_engines.xml b/res/values-en-rZA/donottranslate-search_engines.xml
index bab95c4..2e3af9b 100644
--- a/res/values-en-rZA/donottranslate-search_engines.xml
+++ b/res/values-en-rZA/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>yahoo</item>
<item>bing_en_ZA</item>
diff --git a/res/values-es-rES/donottranslate-search_engines.xml b/res/values-es-rES/donottranslate-search_engines.xml
index 053d786..2b90a06 100644
--- a/res/values-es-rES/donottranslate-search_engines.xml
+++ b/res/values-es-rES/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>ask_es</item>
<item>bing_es_ES</item>
diff --git a/res/values-fr-rBE/donottranslate-search_engines.xml b/res/values-fr-rBE/donottranslate-search_engines.xml
index d743fc0..000a8e9 100644
--- a/res/values-fr-rBE/donottranslate-search_engines.xml
+++ b/res/values-fr-rBE/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>bing_nl_BE</item>
<item>yahoo</item>
diff --git a/res/values-fr-rFR/donottranslate-search_engines.xml b/res/values-fr-rFR/donottranslate-search_engines.xml
index 4a75e4c..5e0568f 100644
--- a/res/values-fr-rFR/donottranslate-search_engines.xml
+++ b/res/values-fr-rFR/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>yahoo_fr</item>
<item>bing_fr_FR</item>
diff --git a/res/values-it-rIT/donottranslate-search_engines.xml b/res/values-it-rIT/donottranslate-search_engines.xml
index c2be0d4..ecf62ec 100644
--- a/res/values-it-rIT/donottranslate-search_engines.xml
+++ b/res/values-it-rIT/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>ask_it</item>
<item>virgilio</item>
diff --git a/res/values-ja-rJP/donottranslate-search_engines.xml b/res/values-ja-rJP/donottranslate-search_engines.xml
index 03c23f4..0417bea 100644
--- a/res/values-ja-rJP/donottranslate-search_engines.xml
+++ b/res/values-ja-rJP/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>yahoo_jp</item>
<item>bing_ja_JP</item>
diff --git a/res/values-ko-rKR/donottranslate-search_engines.xml b/res/values-ko-rKR/donottranslate-search_engines.xml
index 4f24631..3713b20 100644
--- a/res/values-ko-rKR/donottranslate-search_engines.xml
+++ b/res/values-ko-rKR/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>naver</item>
<item>daum</item>
diff --git a/res/values-nb-rNO/donottranslate-search_engines.xml b/res/values-nb-rNO/donottranslate-search_engines.xml
index 418f6d2..7ad9a67 100644
--- a/res/values-nb-rNO/donottranslate-search_engines.xml
+++ b/res/values-nb-rNO/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>bing_nb_NO</item>
<item>abcsok</item>
diff --git a/res/values-nl-rBE/donottranslate-search_engines.xml b/res/values-nl-rBE/donottranslate-search_engines.xml
index d743fc0..000a8e9 100644
--- a/res/values-nl-rBE/donottranslate-search_engines.xml
+++ b/res/values-nl-rBE/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>bing_nl_BE</item>
<item>yahoo</item>
diff --git a/res/values-nl-rNL/donottranslate-search_engines.xml b/res/values-nl-rNL/donottranslate-search_engines.xml
index b9c1b40..c1e7224 100644
--- a/res/values-nl-rNL/donottranslate-search_engines.xml
+++ b/res/values-nl-rNL/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>bing_nl_NL</item>
<item>yahoo_nl</item>
diff --git a/res/values-nl/donottranslate-search_engines.xml b/res/values-nl/donottranslate-search_engines.xml
index 20b80d6..6c0a970 100644
--- a/res/values-nl/donottranslate-search_engines.xml
+++ b/res/values-nl/donottranslate-search_engines.xml
@@ -22,9 +22,10 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>yahoo_nl</item>
<item>bing_nl_NL</item>
- <item>duckduckgo</item>
</string-array>
</resources>
diff --git a/res/values-pl-rPL/donottranslate-search_engines.xml b/res/values-pl-rPL/donottranslate-search_engines.xml
index ddc262e..1551a4d 100644
--- a/res/values-pl-rPL/donottranslate-search_engines.xml
+++ b/res/values-pl-rPL/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>bing_pl_PL</item>
<item>netsprint</item>
diff --git a/res/values-pt-rBR/donottranslate-search_engines.xml b/res/values-pt-rBR/donottranslate-search_engines.xml
index 56cda34..ab0f127 100644
--- a/res/values-pt-rBR/donottranslate-search_engines.xml
+++ b/res/values-pt-rBR/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>bing_pt_BR</item>
<item>yahoo_br</item>
diff --git a/res/values-pt-rPT/donottranslate-search_engines.xml b/res/values-pt-rPT/donottranslate-search_engines.xml
index 3780d73..ff8790d 100644
--- a/res/values-pt-rPT/donottranslate-search_engines.xml
+++ b/res/values-pt-rPT/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>sapo</item>
<item>bing_pt_PT</item>
diff --git a/res/values-ru-rRU/donottranslate-search_engines.xml b/res/values-ru-rRU/donottranslate-search_engines.xml
index 80ff214..af8dd6b 100644
--- a/res/values-ru-rRU/donottranslate-search_engines.xml
+++ b/res/values-ru-rRU/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>yandex_ru</item>
<item>mail_ru</item>
diff --git a/res/values-sv-rSE/donottranslate-search_engines.xml b/res/values-sv-rSE/donottranslate-search_engines.xml
index f216357..774dbb9 100644
--- a/res/values-sv-rSE/donottranslate-search_engines.xml
+++ b/res/values-sv-rSE/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>bing_sv_SE</item>
<item>yahoo_se</item>
diff --git a/res/values-tr-rTR/donottranslate-search_engines.xml b/res/values-tr-rTR/donottranslate-search_engines.xml
index 06cdb12..4502e8f 100644
--- a/res/values-tr-rTR/donottranslate-search_engines.xml
+++ b/res/values-tr-rTR/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>bing_tr_TR</item>
<item>yahoo</item>
diff --git a/res/values-zh-rCN/donottranslate-search_engines.xml b/res/values-zh-rCN/donottranslate-search_engines.xml
index c38055c..9951492 100644
--- a/res/values-zh-rCN/donottranslate-search_engines.xml
+++ b/res/values-zh-rCN/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>baidu</item>
<item>yahoo_cn</item>
diff --git a/res/values-zh-rHK/donottranslate-search_engines.xml b/res/values-zh-rHK/donottranslate-search_engines.xml
index eaf35d5..0f7e154 100644
--- a/res/values-zh-rHK/donottranslate-search_engines.xml
+++ b/res/values-zh-rHK/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>yahoo_hk</item>
<item>bing_zh_HK</item>
diff --git a/res/values-zh-rTW/donottranslate-search_engines.xml b/res/values-zh-rTW/donottranslate-search_engines.xml
index 6d02b43..c8c4070 100644
--- a/res/values-zh-rTW/donottranslate-search_engines.xml
+++ b/res/values-zh-rTW/donottranslate-search_engines.xml
@@ -22,6 +22,8 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>yahoo_tw</item>
<item>bing_zh_TW</item>
diff --git a/res/values/all_search_engines.xml b/res/values/all_search_engines.xml
index 0388c1e..066db6c 100644
--- a/res/values/all_search_engines.xml
+++ b/res/values/all_search_engines.xml
@@ -36,6 +36,14 @@ http://www.opensearch.org/Specifications/OpenSearch/1.1/Draft_4#OpenSearch_1.1_p
-->
<resources>
+ <string-array name="disabled" translatable="false">
+ <item>Disabled</item>
+ <item></item>
+ <item></item>
+ <item></item>
+ <item>UTF-8</item>
+ <item></item>
+ </string-array>
<string-array name="yahoo_uk" translatable="false">
<item>Yahoo! UK &amp; Ireland</item>
<item>uk.yahoo.com</item>
diff --git a/res/values/donottranslate-search_engines.xml b/res/values/donottranslate-search_engines.xml
index daef74c..2ced119 100644
--- a/res/values/donottranslate-search_engines.xml
+++ b/res/values/donottranslate-search_engines.xml
@@ -22,9 +22,10 @@ Each value in the string-array is the name of a value in all_search_engines.xml
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string-array name="search_engines" translatable="false">
+ <item>disabled</item>
+ <item>duckduckgo</item>
<item>google</item>
<item>yahoo</item>
<item>bing</item>
- <item>duckduckgo</item>
</string-array>
</resources>
diff --git a/src/com/android/browser/search/SearchEngineInfo.java b/src/com/android/browser/search/SearchEngineInfo.java
index ec304f6..7866ff1 100644
--- a/src/com/android/browser/search/SearchEngineInfo.java
+++ b/src/com/android/browser/search/SearchEngineInfo.java
@@ -77,9 +77,6 @@ public class SearchEngineInfo {
throw new IllegalArgumentException(
name + " has invalid number of fields - " + mSearchEngineData.length);
}
- if (TextUtils.isEmpty(mSearchEngineData[FIELD_SEARCH_URI])) {
- throw new IllegalArgumentException(name + " has an empty search URI");
- }
// Add the current language/country information to the URIs.
Locale locale = context.getResources().getConfiguration().locale;