diff options
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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <item>disabled</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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <item>disabled</item> <item>google</item> <item>ask_uk</item> <item>yahoo_uk</item> 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <item>disabled</item> + <item>duckduckgo</item> <item>google</item> <item>yahoo_sg</item> <item>bing_en_SG</item> 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 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> <item>google</item> + <item>disabled</item> <item>yahoo</item> <item>bing</item> <item>duckduckgo</item> 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <item>disabled</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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <item>disabled</item> + <item>duckduckgo</item> <item>google</item> <item>bing_nl_NL</item> <item>yahoo_nl</item> 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <item>disabled</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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <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 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <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 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 --> <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 & Ireland</item> <item>uk.yahoo.com</item> 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 --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string-array name="search_engines"> + <item>disabled</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; |