diff options
| author | Bjorn Bringert <bringert@android.com> | 2011-01-19 20:04:13 +0000 |
|---|---|---|
| committer | Bjorn Bringert <bringert@android.com> | 2011-01-19 20:04:13 +0000 |
| commit | 534c607748f4a008974cf0e9c030d378c3177e4b (patch) | |
| tree | 64a6853314e9b35f7056b10cc65bac400a063cf2 | |
| parent | 4c1c0feb85129e9c6cd7daee0071dd90151a0eb9 (diff) | |
| download | android_packages_apps_Gello-534c607748f4a008974cf0e9c030d378c3177e4b.tar.gz android_packages_apps_Gello-534c607748f4a008974cf0e9c030d378c3177e4b.tar.bz2 android_packages_apps_Gello-534c607748f4a008974cf0e9c030d378c3177e4b.zip | |
Update Google search engine data
Bug: 3369333
Change-Id: I1caff40ca2419375e2aaf5588d9d3a710cb8c56a
| -rw-r--r-- | res/values/all_search_engines.xml | 4 | ||||
| -rwxr-xr-x | tools/get_search_engines.py | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/res/values/all_search_engines.xml b/res/values/all_search_engines.xml index 08cf7631..14aba398 100644 --- a/res/values/all_search_engines.xml +++ b/res/values/all_search_engines.xml @@ -208,9 +208,9 @@ http://www.opensearch.org/Specifications/OpenSearch/1.1/Draft_4#OpenSearch_1.1_p <item>Google</item> <item>google.com</item> <item>http://www.google.com/favicon.ico</item> - <item>http://www.google.com/m?hl={language}&ie={inputEncoding}&source=android-browser&q={searchTerms}</item> + <item>http://www.google.com/search?hl={language}&ie={inputEncoding}&source=android-browser&q={searchTerms}</item> <item>UTF-8</item> - <item>http://www.google.com/complete/search?hl={language}&json=true&q={searchTerms}</item> + <item>http://www.google.com/complete/search?hl={language}&client=android&q={searchTerms}</item> </string-array> <string-array name="bing_en_NZ" translatable="false"> <item>Bing</item> diff --git a/tools/get_search_engines.py b/tools/get_search_engines.py index cd73423c..bd6e5f86 100755 --- a/tools/get_search_engines.py +++ b/tools/get_search_engines.py @@ -39,16 +39,15 @@ locales = ["cs-CZ", "da-DK", "de-AT", "de-CH", "de-DE", "el-GR", "en-AU", google_data = ["google", "Google", "google.com", "http://www.google.com/favicon.ico", - "http://www.google.com/m?hl={language}&ie={inputEncoding}&source=android-browser&q={searchTerms}", + "http://www.google.com/search?hl={language}&ie={inputEncoding}&source=android-browser&q={searchTerms}", "UTF-8", - "http://www.google.com/complete/search?hl={language}&json=true&q={searchTerms}"] + "http://www.google.com/complete/search?hl={language}&client=android&q={searchTerms}"] class SearchEngineManager(object): """Manages list of search engines and creates locale specific lists. The main method useful for the caller is generateListForLocale(), which - creates a locale specific search_engines.xml file suitable for use by the - Android WebSearchProvider implementation. + creates a locale specific donottranslate-search_engines.xml file. """ def __init__(self): @@ -195,7 +194,7 @@ class SearchEngineManager(object): self.writeEngineList(os.path.join(self.resdir, 'values'), "default") def generateListForLocale(self, locale): - """Creates a new locale specific search_engines.xml file. + """Creates a new locale specific donottranslate-search_engines.xml file. The new file contains search engines specific to that country. If required this function updates all_search_engines.xml file with any new search @@ -237,7 +236,7 @@ class SearchEngineManager(object): text.append(' </string-array>\n'); self.generateXmlFromTemplate(os.path.join(sys.path[0], 'search_engines.template.xml'), - os.path.join(dir_path, 'search_engines.xml'), + os.path.join(dir_path, 'donottranslate-search_engines.xml'), text) def generateXmlFromTemplate(self, template_path, out_path, text): @@ -265,4 +264,3 @@ if __name__ == "__main__": for locale in locales: manager.generateListForLocale(locale) manager.writeAllEngines() - |