diff options
63 files changed, 131 insertions, 18 deletions
diff --git a/res/raw/favicon_cmwiki.ico b/res/raw/favicon_cmwiki.ico Binary files differdeleted file mode 100644 index f9afe7530..000000000 --- a/res/raw/favicon_cmwiki.ico +++ /dev/null diff --git a/res/raw/favicon_cyanogenmod.ico b/res/raw/favicon_cyanogenmod.ico Binary files differdeleted file mode 100644 index 2afa6a119..000000000 --- a/res/raw/favicon_cyanogenmod.ico +++ /dev/null diff --git a/res/raw/favicon_eff.ico b/res/raw/favicon_eff.ico Binary files differnew file mode 100644 index 000000000..782904422 --- /dev/null +++ b/res/raw/favicon_eff.ico diff --git a/res/raw/favicon_fsf.ico b/res/raw/favicon_fsf.ico Binary files differnew file mode 100644 index 000000000..1a616bdcb --- /dev/null +++ b/res/raw/favicon_fsf.ico diff --git a/res/raw/favicon_fsfe.ico b/res/raw/favicon_fsfe.ico Binary files differnew file mode 100644 index 000000000..9127b9233 --- /dev/null +++ b/res/raw/favicon_fsfe.ico diff --git a/res/raw/favicon_gnu.ico b/res/raw/favicon_gnu.ico Binary files differnew file mode 100644 index 000000000..dd9781f86 --- /dev/null +++ b/res/raw/favicon_gnu.ico diff --git a/res/raw/favicon_google.ico b/res/raw/favicon_google.ico Binary files differdeleted file mode 100644 index ee7c943ab..000000000 --- a/res/raw/favicon_google.ico +++ /dev/null diff --git a/res/raw/favicon_replicant.ico b/res/raw/favicon_replicant.ico Binary files differnew file mode 100644 index 000000000..465873c25 --- /dev/null +++ b/res/raw/favicon_replicant.ico diff --git a/res/raw/favicon_wikipedia.ico b/res/raw/favicon_wikipedia.ico Binary files differnew file mode 100644 index 000000000..31b0e3809 --- /dev/null +++ b/res/raw/favicon_wikipedia.ico diff --git a/res/raw/thumb_cmwiki.png b/res/raw/thumb_cmwiki.png Binary files differdeleted file mode 100644 index bb33f237b..000000000 --- a/res/raw/thumb_cmwiki.png +++ /dev/null diff --git a/res/raw/thumb_cyanogenmod.png b/res/raw/thumb_cyanogenmod.png Binary files differdeleted file mode 100644 index 6fa7d6893..000000000 --- a/res/raw/thumb_cyanogenmod.png +++ /dev/null diff --git a/res/raw/thumb_eff.png b/res/raw/thumb_eff.png Binary files differnew file mode 100644 index 000000000..82a7dcf8e --- /dev/null +++ b/res/raw/thumb_eff.png diff --git a/res/raw/thumb_fsf.png b/res/raw/thumb_fsf.png Binary files differnew file mode 100644 index 000000000..befa2f4f4 --- /dev/null +++ b/res/raw/thumb_fsf.png diff --git a/res/raw/thumb_fsfe.png b/res/raw/thumb_fsfe.png Binary files differnew file mode 100644 index 000000000..7d97cef2e --- /dev/null +++ b/res/raw/thumb_fsfe.png diff --git a/res/raw/thumb_gnu.png b/res/raw/thumb_gnu.png Binary files differnew file mode 100644 index 000000000..047b3d098 --- /dev/null +++ b/res/raw/thumb_gnu.png diff --git a/res/raw/thumb_google.png b/res/raw/thumb_google.png Binary files differdeleted file mode 100644 index bb93d82fe..000000000 --- a/res/raw/thumb_google.png +++ /dev/null diff --git a/res/raw/thumb_replicant.png b/res/raw/thumb_replicant.png Binary files differnew file mode 100644 index 000000000..1c03ef9df --- /dev/null +++ b/res/raw/thumb_replicant.png diff --git a/res/raw/thumb_replicant_blog.png b/res/raw/thumb_replicant_blog.png Binary files differnew file mode 100644 index 000000000..6254c96e4 --- /dev/null +++ b/res/raw/thumb_replicant_blog.png diff --git a/res/raw/thumb_replicant_forums.png b/res/raw/thumb_replicant_forums.png Binary files differnew file mode 100644 index 000000000..1ee1196a9 --- /dev/null +++ b/res/raw/thumb_replicant_forums.png diff --git a/res/raw/thumb_replicant_tracker.png b/res/raw/thumb_replicant_tracker.png Binary files differnew file mode 100644 index 000000000..07527c86d --- /dev/null +++ b/res/raw/thumb_replicant_tracker.png diff --git a/res/raw/thumb_replicant_wiki.png b/res/raw/thumb_replicant_wiki.png Binary files differnew file mode 100644 index 000000000..45d679ef3 --- /dev/null +++ b/res/raw/thumb_replicant_wiki.png diff --git a/res/raw/thumb_wikipedia.png b/res/raw/thumb_wikipedia.png Binary files differnew file mode 100644 index 000000000..792946877 --- /dev/null +++ b/res/raw/thumb_wikipedia.png diff --git a/res/values-cs-rCZ/donottranslate-search_engines.xml b/res/values-cs-rCZ/donottranslate-search_engines.xml index 1b1966ef8..dc578a539 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 5c36f501e..bdbc87a8a 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 46fc38ba9..24cb2d009 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 d0f1f7e83..ae911b9d1 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 3f6f9d027..2b2997abc 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 78e978e4e..a84cf7937 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 8cced4401..aa4094af8 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 5484f3258..c93ae9839 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 5ac2b7df3..5d66ef329 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 8503207b0..21f72c87f 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 578377b37..e6a5f29a1 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 54ff23754..31fa87ec7 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 0e58f3ae1..cd6931322 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 d447213a6..ca9c26bba 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 b86a5eec4..26bea7632 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 0e6c8da5c..764d9f9c3 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-fr/strings.xml b/res/values-fr/strings.xml index 77ce14743..59eb54f1c 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -219,6 +219,8 @@ <string name="pref_security_save_form_data_summary" msgid="4994074685153708026">"Mémoriser les données saisies dans les formulaires pour les réutiliser"</string> <string name="pref_security_show_security_warning" msgid="8901135676266754559">"Avertiss. de sécurité"</string> <string name="pref_security_show_security_warning_summary" msgid="5260098316025397525">"Afficher un avertissement en cas de problème de sécurité d\'un site"</string> + <string name="pref_security_show_search_suggestions">"Afficher les suggestions de recherche"</string> + <string name="pref_security_show_search_suggestions_summary">"Afficher les suggestions de recherche lors de la saisie dans le champ URL"</string> <string name="pref_security_accept_cookies" msgid="3201367661925047989">"Accepter les cookies"</string> <string name="pref_security_accept_cookies_summary" msgid="1907951236154433751">"Autoriser les sites à enregistrer les données des cookies et à les lire"</string> <string-array name="pref_text_size_choices"> diff --git a/res/values-it-rIT/donottranslate-search_engines.xml b/res/values-it-rIT/donottranslate-search_engines.xml index e8794c946..c07bcc067 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 caaaa1e33..c846364c3 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 f9326c224..a984eca4f 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 2fc61076e..5d183aa34 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 b86a5eec4..26bea7632 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 73017512e..117dd69d3 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 75dd546d4..692a98aa9 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 eed31fcf1..b1f1a8584 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 43101c43b..142b16b08 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 016073b10..d44f351a8 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 0286b5709..fb3686185 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 a96866744..4867e6d7c 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 67a6ae8ad..f7b7dc843 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 b324669af..2577f2c29 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 eed0252e6..c4e27ca6b 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 a87c880c4..4dcac6897 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/bookmarks_icons.xml b/res/values/bookmarks_icons.xml index 50d7eaf60..fe2385fef 100644 --- a/res/values/bookmarks_icons.xml +++ b/res/values/bookmarks_icons.xml @@ -1,11 +1,25 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <array name="bookmark_preloads"> - <item>@raw/favicon_google</item> - <item>@raw/thumb_google</item> - <item>@raw/favicon_cyanogenmod</item> - <item>@raw/thumb_cyanogenmod</item> - <item>@raw/favicon_cmwiki</item> - <item>@raw/thumb_cmwiki</item> + <item>@raw/favicon_fsf</item> + <item>@raw/thumb_fsf</item> + <item>@raw/favicon_fsfe</item> + <item>@raw/thumb_fsfe</item> + <item>@raw/favicon_eff</item> + <item>@raw/thumb_eff</item> + <item>@raw/favicon_wikipedia</item> + <item>@raw/thumb_wikipedia</item> + <item>@raw/favicon_gnu</item> + <item>@raw/thumb_gnu</item> + <item>@raw/favicon_replicant</item> + <item>@raw/thumb_replicant</item> + <item>@raw/favicon_replicant</item> + <item>@raw/thumb_replicant_blog</item> + <item>@raw/favicon_replicant</item> + <item>@raw/thumb_replicant_wiki</item> + <item>@raw/favicon_replicant</item> + <item>@raw/thumb_replicant_tracker</item> + <item>@raw/favicon_replicant</item> + <item>@raw/thumb_replicant_forums</item> </array> </resources> diff --git a/res/values/donottranslate-search_engines.xml b/res/values/donottranslate-search_engines.xml index 54ff23754..f55d99ada 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/res/values/strings.xml b/res/values/strings.xml index d79c7f783..29f2be286 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -487,6 +487,10 @@ <!-- Settings summmary --> <string name="pref_security_show_security_warning_summary">Show warning if there\'s a problem with a site\'s security</string> <!-- Settings label --> + <string name="pref_security_show_search_suggestions">Show search suggestions</string> + <!-- Settings summmary --> + <string name="pref_security_show_search_suggestions_summary">Show search suggestions when typing in the URL field</string> + <!-- Settings label --> <string name="pref_security_accept_cookies">Accept cookies</string> <!-- Settings summary --> <string name="pref_security_accept_cookies_summary">Allow sites to save and read cookie data</string> @@ -795,16 +799,30 @@ <!-- The default homepage. --> <string name="homepage_base" translatable="false"> - https://www.google.com/webhp?client={CID}&source=android-home</string> + about:blank</string> <!-- Bookmarks --> <string-array name="bookmarks" translatable="false"> - <item>Google</item> - <item>http://www.google.com</item> - <item>CyanogenMod</item> - <item>http://www.cyanogenmod.org</item> - <item>CyanogenMod Wiki</item> - <item>http://wiki.cyanogenmod.org/w/Main_Page</item> + <item>FSF</item> + <item>https://www.fsf.org/</item> + <item>FSFE</item> + <item>https://www.fsfe.org/</item> + <item>EFF</item> + <item>https://www.eff.org/</item> + <item>Wikipedia</item> + <item>https://www.wikipedia.org/</item> + <item>GNU</item> + <item>https://www.gnu.org/</item> + <item>Replicant</item> + <item>https://www.replicant.us/</item> + <item>Replicant blog</item> + <item>https://blog.replicant.us/</item> + <item>Replicant wiki</item> + <item>https://redmine.replicant.us/projects/replicant/wiki</item> + <item>Replicant tracker</item> + <item>https://redmine.replicant.us/projects/replicant/issues</item> + <item>Replicant forums</item> + <item>https://redmine.replicant.us/projects/replicant/boards</item> </string-array> <!-- The description of the suggestion that lets the user search the web for the query currently diff --git a/res/xml/privacy_security_preferences.xml b/res/xml/privacy_security_preferences.xml index 263360004..a574e6143 100644 --- a/res/xml/privacy_security_preferences.xml +++ b/res/xml/privacy_security_preferences.xml @@ -37,6 +37,12 @@ android:title="@string/pref_security_show_security_warning" android:summary="@string/pref_security_show_security_warning_summary" /> + <CheckBoxPreference + android:key="show_search_suggestions" + android:defaultValue="false" + android:title="@string/pref_security_show_search_suggestions" + android:summary="@string/pref_security_show_search_suggestions_summary" /> + <PreferenceCategory android:title="@string/pref_privacy_cookies_title"> <CheckBoxPreference android:key="accept_cookies" diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java index e76fa5d8c..defa5da9f 100644 --- a/src/com/android/browser/BrowserSettings.java +++ b/src/com/android/browser/BrowserSettings.java @@ -797,6 +797,10 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener, return mPrefs.getBoolean(PREF_SHOW_SECURITY_WARNINGS, true); } + public boolean showSearchSuggestions() { + return mPrefs.getBoolean(PREF_SHOW_SEARCH_SUGGESTIONS, false); + } + public boolean acceptCookies() { return mPrefs.getBoolean(PREF_ACCEPT_COOKIES, true); } diff --git a/src/com/android/browser/PreferenceKeys.java b/src/com/android/browser/PreferenceKeys.java index 3bb2438db..ec99f4fef 100644 --- a/src/com/android/browser/PreferenceKeys.java +++ b/src/com/android/browser/PreferenceKeys.java @@ -99,6 +99,7 @@ public interface PreferenceKeys { static final String PREF_REMEMBER_PASSWORDS = "remember_passwords"; static final String PREF_SAVE_FORMDATA = "save_formdata"; static final String PREF_SHOW_SECURITY_WARNINGS = "show_security_warnings"; + static final String PREF_SHOW_SEARCH_SUGGESTIONS = "show_search_suggestions"; // ---------------------- // Keys for bandwidth_preferences.xml diff --git a/src/com/android/browser/SuggestionsAdapter.java b/src/com/android/browser/SuggestionsAdapter.java index 62fa0bca6..a759e239e 100644 --- a/src/com/android/browser/SuggestionsAdapter.java +++ b/src/com/android/browser/SuggestionsAdapter.java @@ -202,9 +202,15 @@ public class SuggestionsAdapter extends BaseAdapter implements Filterable, @Override protected List<SuggestItem> doInBackground(CharSequence... params) { + List<SuggestItem> results = new ArrayList<SuggestItem>(); + + // Don't query the search engine if disabled in settings + if (!mSettings.showSearchSuggestions()) { + return results; + } + SuggestCursor cursor = new SuggestCursor(); cursor.runQuery(params[0]); - List<SuggestItem> results = new ArrayList<SuggestItem>(); int count = cursor.getCount(); for (int i = 0; i < count; i++) { results.add(cursor.getItem()); diff --git a/src/com/android/browser/search/SearchEngineInfo.java b/src/com/android/browser/search/SearchEngineInfo.java index ec304f64c..7866ff178 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; |
