From 47164dd38df598b39426eca5f972e5544ef6e7f7 Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Wed, 2 Jul 2014 20:09:27 +0200 Subject: Possibility to disable the search engine and DuckDuckGo for all! Signed-off-by: Paul Kocialkowski --- res/values-cs-rCZ/donottranslate-search_engines.xml | 2 ++ res/values-da-rDK/donottranslate-search_engines.xml | 2 ++ res/values-de-rAT/donottranslate-search_engines.xml | 2 ++ res/values-de-rCH/donottranslate-search_engines.xml | 2 ++ res/values-de-rDE/donottranslate-search_engines.xml | 2 ++ res/values-el-rGR/donottranslate-search_engines.xml | 2 ++ res/values-en-rAU/donottranslate-search_engines.xml | 2 ++ res/values-en-rGB/donottranslate-search_engines.xml | 5 +++-- res/values-en-rIE/donottranslate-search_engines.xml | 2 ++ res/values-en-rNZ/donottranslate-search_engines.xml | 2 ++ res/values-en-rSG/donottranslate-search_engines.xml | 2 ++ res/values-en-rZA/donottranslate-search_engines.xml | 2 ++ res/values-es-rES/donottranslate-search_engines.xml | 2 ++ res/values-fr-rBE/donottranslate-search_engines.xml | 2 ++ res/values-fr-rFR/donottranslate-search_engines.xml | 2 ++ res/values-it-rIT/donottranslate-search_engines.xml | 2 ++ res/values-ja-rJP/donottranslate-search_engines.xml | 2 ++ res/values-ko-rKR/donottranslate-search_engines.xml | 2 ++ res/values-nb-rNO/donottranslate-search_engines.xml | 2 ++ res/values-nl-rBE/donottranslate-search_engines.xml | 2 ++ res/values-nl-rNL/donottranslate-search_engines.xml | 2 ++ res/values-nl/donottranslate-search_engines.xml | 3 ++- res/values-pl-rPL/donottranslate-search_engines.xml | 2 ++ res/values-pt-rBR/donottranslate-search_engines.xml | 2 ++ res/values-pt-rPT/donottranslate-search_engines.xml | 2 ++ res/values-ru-rRU/donottranslate-search_engines.xml | 2 ++ res/values-sv-rSE/donottranslate-search_engines.xml | 2 ++ res/values-tr-rTR/donottranslate-search_engines.xml | 2 ++ res/values-zh-rCN/donottranslate-search_engines.xml | 2 ++ res/values-zh-rHK/donottranslate-search_engines.xml | 2 ++ res/values-zh-rTW/donottranslate-search_engines.xml | 2 ++ res/values/all_search_engines.xml | 8 ++++++++ res/values/donottranslate-search_engines.xml | 3 ++- src/com/android/browser/search/SearchEngineInfo.java | 3 --- 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 --> + disabled + duckduckgo google seznam bing_cs_CZ 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 --> + disabled + duckduckgo google bing_da_DK yahoo_dk 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 --> + disabled + duckduckgo google yahoo_at bing_de_AT 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 --> + disabled + duckduckgo google yahoo_ch bing_de_CH 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 --> + disabled + duckduckgo google ask_de bing_de_DE 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 --> + disabled + duckduckgo google yahoo in 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 --> + disabled + duckduckgo google bing_en_AU yahoo_au 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 --> + disabled + duckduckgo + duckduckgo_en_gb google ask_uk yahoo_uk bing_en_GB - duckduckgo - duckduckgo_en_gb 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 --> + disabled + duckduckgo google yahoo_uk bing_en_IE 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 --> + disabled + duckduckgo google yahoo_nz bing_en_NZ 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 --> + disabled + duckduckgo google yahoo_sg bing_en_SG 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 --> + disabled + duckduckgo google yahoo bing_en_ZA 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 --> + disabled + duckduckgo google ask_es bing_es_ES 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 --> + disabled + duckduckgo google bing_nl_BE yahoo 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 --> + disabled + duckduckgo google yahoo_fr bing_fr_FR 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 --> + disabled + duckduckgo google ask_it virgilio 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 --> + disabled + duckduckgo google yahoo_jp bing_ja_JP 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 --> + disabled + duckduckgo google naver daum 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 --> + disabled + duckduckgo google bing_nb_NO abcsok 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 --> + disabled + duckduckgo google bing_nl_BE yahoo 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 --> + disabled + duckduckgo google bing_nl_NL yahoo_nl 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 --> + disabled + duckduckgo google yahoo_nl bing_nl_NL - duckduckgo 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 --> + disabled + duckduckgo google bing_pl_PL netsprint 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 --> + disabled + duckduckgo google bing_pt_BR yahoo_br 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 --> + disabled + duckduckgo google sapo bing_pt_PT 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 --> + disabled + duckduckgo google yandex_ru mail_ru 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 --> + disabled + duckduckgo google bing_sv_SE yahoo_se 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 --> + disabled + duckduckgo google bing_tr_TR yahoo 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 --> + disabled + duckduckgo google baidu yahoo_cn 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 --> + disabled + duckduckgo google yahoo_hk bing_zh_HK 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 --> + disabled + duckduckgo google yahoo_tw bing_zh_TW 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 --> + + Disabled + + + + UTF-8 + + Yahoo! UK & Ireland uk.yahoo.com 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 --> + disabled + duckduckgo google yahoo bing - duckduckgo 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; -- cgit v1.1