diff options
67 files changed, 135 insertions, 162 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 53c6325..1f05903 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -240,14 +240,6 @@ <!-- Makes .BrowserActivity the search target for any activity in Browser --> <meta-data android:name="android.app.default_searchable" android:value=".BrowserActivity" /> - <!-- Application code for RLZ tracking. RLZ assigns non-unique, non-personally identifiable - tracking labels to client products; these labels sometimes appear in Google search - queries. See http://code.google.com/p/rlz for more info. - - This value signifies to the RLZ client that this application uses RLZ tracking. --> - <meta-data android:name="com.google.android.partnersetup.RLZ_ACCESS_POINT" - android:value="@string/rlz_access_point" /> - <receiver android:name=".OpenDownloadReceiver"> <intent-filter> <action android:name="android.intent.action.DOWNLOAD_NOTIFICATION_CLICKED"/> diff --git a/res/raw/favicon_cmwiki.ico b/res/raw/favicon_cmwiki.ico Binary files differdeleted file mode 100644 index f9afe75..0000000 --- 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 2afa6a1..0000000 --- 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 0000000..7829044 --- /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 0000000..1a616bd --- /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 0000000..9127b92 --- /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 0000000..dd9781f --- /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 ee7c943..0000000 --- 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 0000000..465873c --- /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 0000000..31b0e38 --- /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 bb33f23..0000000 --- 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 6fa7d68..0000000 --- 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 0000000..82a7dcf --- /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 0000000..befa2f4 --- /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 0000000..7d97cef --- /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 0000000..047b3d0 --- /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 bb93d82..0000000 --- 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 0000000..1c03ef9 --- /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 0000000..6254c96 --- /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 0000000..1ee1196 --- /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 0000000..07527c8 --- /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 0000000..45d679e --- /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 0000000..7929468 --- /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 d572ea8..901dc1e 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 0a39ef9..f86d0c8 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 f40d9dc..650a19b 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 c15c92c..5118b55 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 a0b0176..36ddf8a 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 d37b7c7..150708d 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 3d26933..9f4876a 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 1791898..d2d2688 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 5ab57be..fc2dadd 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 df36687..4006410 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 e0b9739..1cda4c4 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 3f6f650..1972061 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 77ce147..59eb54f 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 513bda8..c18be8f 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 2849cc4..71f477e 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 5512319..12d9e81 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 45db30b..9a8116a 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 e0b9739..1cda4c4 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 1f4b98d..ee6af53 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 46c8459..39f37b5 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 ac76b03..02e1bd3 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 6bac165..f9d4021 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 dcf1d7f..0c1bd0f 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 a1f5c49..256e87e 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 af76290..f115f24 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 7b6b8cb..c4441e3 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 482448f..fb2d68a 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/bookmarks_icons.xml b/res/values/bookmarks_icons.xml index 50d7eaf..fe2385f 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 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/res/values/strings.xml b/res/values/strings.xml index d79c7f7..805e1ea 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> @@ -662,7 +666,7 @@ <string name="pref_data_preload_value_never" translatable="false">NEVER</string> <string name="pref_data_preload_value_wifi_only" translatable="false">WIFI_ONLY</string> <string name="pref_data_preload_value_always" translatable="false">ALWAYS</string> - <string name="pref_data_preload_default_value" translatable="false">@string/pref_data_preload_value_wifi_only</string> + <string name="pref_data_preload_default_value" translatable="false">@string/pref_data_preload_value_never</string> <string-array name="pref_data_preload_values" translatable="false"> <item><xliff:g>@string/pref_data_preload_value_never</xliff:g></item> <item><xliff:g>@string/pref_data_preload_value_wifi_only</xliff:g></item> @@ -684,7 +688,7 @@ <string name="pref_link_prefetch_value_never" translatable="false">NEVER</string> <string name="pref_link_prefetch_value_wifi_only" translatable="false">WIFI_ONLY</string> <string name="pref_link_prefetch_value_always" translatable="false">ALWAYS</string> - <string name="pref_link_prefetch_default_value" translatable="false">@string/pref_link_prefetch_value_wifi_only</string> + <string name="pref_link_prefetch_default_value" translatable="false">@string/pref_link_prefetch_value_never</string> <string-array name="pref_link_prefetch_values" translatable="false"> <item><xliff:g>@string/pref_link_prefetch_value_never</xliff:g></item> <item><xliff:g>@string/pref_link_prefetch_value_wifi_only</xliff:g></item> @@ -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 @@ -876,9 +894,6 @@ <!-- The folder name for the special "Other Bookmarks" folder created by Chrome [CHAR LIMIT=24] --> <string name="other_bookmarks">Other Bookmarks</string> - <!-- Access point for RLZ tracking. --> - <string name="rlz_access_point">Y1</string> - <!-- Title for a dialog asking the user which account to sync their bookmarks to [CHAR LIMIT=32] --> <string name="account_chooser_dialog_title" msgid="4833571985009544332">Choose account</string> diff --git a/res/xml-sw600dp/advanced_preferences.xml b/res/xml-sw600dp/advanced_preferences.xml index f3107d8..94e2ee3 100644 --- a/res/xml-sw600dp/advanced_preferences.xml +++ b/res/xml-sw600dp/advanced_preferences.xml @@ -46,7 +46,7 @@ <ListPreference android:key="plugin_state" android:title="@string/pref_content_plugins" - android:defaultValue="ON" + android:defaultValue="OFF" android:entries="@array/pref_content_plugins_choices" android:entryValues="@array/pref_content_plugins_values" android:dialogTitle="@string/pref_content_plugins" /> diff --git a/res/xml/advanced_preferences.xml b/res/xml/advanced_preferences.xml index 1b051f8..e806897 100644 --- a/res/xml/advanced_preferences.xml +++ b/res/xml/advanced_preferences.xml @@ -51,7 +51,7 @@ <ListPreference android:key="plugin_state" android:title="@string/pref_content_plugins" - android:defaultValue="ON" + android:defaultValue="OFF" android:entries="@array/pref_content_plugins_choices" android:entryValues="@array/pref_content_plugins_values" android:dialogTitle="@string/pref_content_plugins" /> diff --git a/res/xml/privacy_security_preferences.xml b/res/xml/privacy_security_preferences.xml index 2633600..a574e61 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 e76fa5d..defa5da 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 3bb2438..ec99f4f 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 62fa0bc..a759e23 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/UrlHandler.java b/src/com/android/browser/UrlHandler.java index 084a479..52919c8 100644 --- a/src/com/android/browser/UrlHandler.java +++ b/src/com/android/browser/UrlHandler.java @@ -38,9 +38,6 @@ import java.util.regex.Matcher; */ public class UrlHandler { - static final String RLZ_PROVIDER = "com.google.android.partnersetup.rlzappprovider"; - static final Uri RLZ_PROVIDER_URI = Uri.parse("content://" + RLZ_PROVIDER + "/"); - // Use in overrideUrlLoading /* package */ final static String SCHEME_WTAI = "wtai://wp/"; /* package */ final static String SCHEME_WTAI_MC = "wtai://wp/mc;"; @@ -50,9 +47,6 @@ public class UrlHandler { Controller mController; Activity mActivity; - private Boolean mIsProviderPresent = null; - private Uri mRlzUri = null; - public UrlHandler(Controller controller) { mController = controller; mActivity = mController.getActivity(); @@ -101,20 +95,6 @@ public class UrlHandler { return false; } - // If this is a Google search, attempt to add an RLZ string - // (if one isn't already present). - if (rlzProviderPresent()) { - Uri siteUri = Uri.parse(url); - if (needsRlzString(siteUri)) { - // Need to look up the RLZ info from a database, so do it in an - // AsyncTask. Although we are not overriding the URL load synchronously, - // we guarantee that we will handle this URL load after the task executes, - // so it's safe to just return true to WebCore now to stop its own loading. - new RLZTask(tab, siteUri, view).execute(); - return true; - } - } - if (startActivityForUrl(tab, url)) { return true; } @@ -248,113 +228,4 @@ public class UrlHandler { return false; } - - // TODO: Move this class into Tab, where it can be properly stopped upon - // closure of the tab - private class RLZTask extends AsyncTask<Void, Void, String> { - private Tab mTab; - private Uri mSiteUri; - private WebView mWebView; - - public RLZTask(Tab tab, Uri uri, WebView webView) { - mTab = tab; - mSiteUri = uri; - mWebView = webView; - } - - protected String doInBackground(Void... unused) { - String result = mSiteUri.toString(); - Cursor cur = null; - try { - cur = mActivity.getContentResolver() - .query(getRlzUri(), null, null, null, null); - if (cur != null && cur.moveToFirst() && !cur.isNull(0)) { - result = mSiteUri.buildUpon() - .appendQueryParameter("rlz", cur.getString(0)) - .build().toString(); - } - } finally { - if (cur != null) { - cur.close(); - } - } - return result; - } - - protected void onPostExecute(String result) { - // abort if we left browser already - if (mController.isActivityPaused()) return; - // Make sure the Tab was not closed while handling the task - if (mController.getTabControl().getTabPosition(mTab) != -1) { - // If the Activity Manager is not invoked, load the URL directly - if (!startActivityForUrl(mTab, result)) { - if (!handleMenuClick(mTab, result)) { - mController.loadUrl(mTab, result); - } - } - } - } - } - - // Determine whether the RLZ provider is present on the system. - private boolean rlzProviderPresent() { - if (mIsProviderPresent == null) { - PackageManager pm = mActivity.getPackageManager(); - mIsProviderPresent = pm.resolveContentProvider(RLZ_PROVIDER, 0) != null; - } - return mIsProviderPresent; - } - - // Retrieve the RLZ access point string and cache the URI used to - // retrieve RLZ values. - private Uri getRlzUri() { - if (mRlzUri == null) { - String ap = mActivity.getResources() - .getString(R.string.rlz_access_point); - mRlzUri = Uri.withAppendedPath(RLZ_PROVIDER_URI, ap); - } - return mRlzUri; - } - - // Determine if this URI appears to be for a Google search - // and does not have an RLZ parameter. - // Taken largely from Chrome source, src/chrome/browser/google_url_tracker.cc - private static boolean needsRlzString(Uri uri) { - String scheme = uri.getScheme(); - if (("http".equals(scheme) || "https".equals(scheme)) && - (uri.getQueryParameter("q") != null) && - (uri.getQueryParameter("rlz") == null)) { - String host = uri.getHost(); - if (host == null) { - return false; - } - String[] hostComponents = host.split("\\."); - - if (hostComponents.length < 2) { - return false; - } - int googleComponent = hostComponents.length - 2; - String component = hostComponents[googleComponent]; - if (!"google".equals(component)) { - if (hostComponents.length < 3 || - (!"co".equals(component) && !"com".equals(component))) { - return false; - } - googleComponent = hostComponents.length - 3; - if (!"google".equals(hostComponents[googleComponent])) { - return false; - } - } - - // Google corp network handling. - if (googleComponent > 0 && "corp".equals( - hostComponents[googleComponent - 1])) { - return false; - } - - return true; - } - return false; - } - } 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; |