From c3863a9d42b2952cf47b8a6eddff52d539e6b94f 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 Conflicts: res/values-cs-rCZ/donottranslate-search_engines.xml res/values-da-rDK/donottranslate-search_engines.xml res/values-de-rAT/donottranslate-search_engines.xml res/values-de-rCH/donottranslate-search_engines.xml res/values-de-rDE/donottranslate-search_engines.xml res/values-el-rGR/donottranslate-search_engines.xml res/values-en-rAU/donottranslate-search_engines.xml res/values-en-rGB/donottranslate-search_engines.xml res/values-en-rIE/donottranslate-search_engines.xml res/values-en-rNZ/donottranslate-search_engines.xml res/values-en-rSG/donottranslate-search_engines.xml res/values-en-rUS/donottranslate-search_engines.xml res/values-en-rZA/donottranslate-search_engines.xml res/values-es-rES/donottranslate-search_engines.xml res/values-fr-rBE/donottranslate-search_engines.xml res/values-fr-rFR/donottranslate-search_engines.xml res/values-it-rIT/donottranslate-search_engines.xml res/values-ja-rJP/donottranslate-search_engines.xml res/values-ko-rKR/donottranslate-search_engines.xml res/values-nb-rNO/donottranslate-search_engines.xml res/values-nl-rBE/donottranslate-search_engines.xml res/values-nl-rNL/donottranslate-search_engines.xml res/values-pl-rPL/donottranslate-search_engines.xml res/values-pt-rBR/donottranslate-search_engines.xml res/values-pt-rPT/donottranslate-search_engines.xml res/values-ru-rRU/donottranslate-search_engines.xml res/values-sv-rSE/donottranslate-search_engines.xml res/values-tr-rTR/donottranslate-search_engines.xml res/values-zh-rCN/donottranslate-search_engines.xml res/values-zh-rHK/donottranslate-search_engines.xml res/values-zh-rTW/donottranslate-search_engines.xml res/values/donottranslate-search_engines.xml Change-Id: If429077edc9960f336d3cd653f00a125d8cefad2 --- 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 | 1 + 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 | 1 + 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-rUS/donottranslate-search_engines.xml | 1 + res/values-en-rZA/donottranslate-search_engines.xml | 2 ++ res/values-es-rES/donottranslate-search_engines.xml | 1 + 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-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 | 1 + 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 | 2 +- src/com/android/browser/search/SearchEngineInfo.java | 3 --- 34 files changed, 66 insertions(+), 4 deletions(-) diff --git a/res/values-cs-rCZ/donottranslate-search_engines.xml b/res/values-cs-rCZ/donottranslate-search_engines.xml index 1b1966e..dc578a5 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 5c36f50..bdbc87a 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 46fc38b..24cb2d0 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 d0f1f7e..ae911b9 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 3f6f9d0..2b2997a 100644 --- a/res/values-de-rDE/donottranslate-search_engines.xml +++ b/res/values-de-rDE/donottranslate-search_engines.xml @@ -22,6 +22,7 @@ Each value in the string-array is the name of a value in all_search_engines.xml --> + disabled 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 78e978e..a84cf79 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 8cced44..aa4094a 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 5484f32..c93ae98 100644 --- a/res/values-en-rGB/donottranslate-search_engines.xml +++ b/res/values-en-rGB/donottranslate-search_engines.xml @@ -22,6 +22,7 @@ Each value in the string-array is the name of a value in all_search_engines.xml --> + disabled google ask_uk yahoo_uk diff --git a/res/values-en-rIE/donottranslate-search_engines.xml b/res/values-en-rIE/donottranslate-search_engines.xml index 5ac2b7d..5d66ef3 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 8503207..21f72c8 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 578377b..e6a5f29 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-rUS/donottranslate-search_engines.xml b/res/values-en-rUS/donottranslate-search_engines.xml index 54ff237..31fa87e 100644 --- a/res/values-en-rUS/donottranslate-search_engines.xml +++ b/res/values-en-rUS/donottranslate-search_engines.xml @@ -23,6 +23,7 @@ Each value in the string-array is the name of a value in all_search_engines.xml google + disabled yahoo bing duckduckgo diff --git a/res/values-en-rZA/donottranslate-search_engines.xml b/res/values-en-rZA/donottranslate-search_engines.xml index 0e58f3a..cd69313 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 d447213..ca9c26b 100644 --- a/res/values-es-rES/donottranslate-search_engines.xml +++ b/res/values-es-rES/donottranslate-search_engines.xml @@ -22,6 +22,7 @@ Each value in the string-array is the name of a value in all_search_engines.xml --> + disabled 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 b86a5ee..26bea76 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 0e6c8da..764d9f9 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 e8794c9..c07bcc0 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 caaaa1e..c846364 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 f9326c2..a984eca 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 2fc6107..5d183aa 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 b86a5ee..26bea76 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 7301751..117dd69 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-pl-rPL/donottranslate-search_engines.xml b/res/values-pl-rPL/donottranslate-search_engines.xml index 75dd546..692a98a 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 eed31fc..b1f1a85 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 43101c4..142b16b 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 016073b..d44f351 100644 --- a/res/values-ru-rRU/donottranslate-search_engines.xml +++ b/res/values-ru-rRU/donottranslate-search_engines.xml @@ -22,6 +22,7 @@ Each value in the string-array is the name of a value in all_search_engines.xml --> + disabled 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 0286b57..fb36861 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 a968667..4867e6d 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 67a6ae8..f7b7dc8 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 b324669..2577f2c 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 eed0252..c4e27ca 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 a87c880..4dcac68 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 54ff237..f55d99a 100644 --- a/res/values/donottranslate-search_engines.xml +++ b/res/values/donottranslate-search_engines.xml @@ -22,9 +22,9 @@ Each value in the string-array is the name of a value in all_search_engines.xml --> + disabled 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