summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorBjorn Bringert <bringert@android.com>2010-09-15 13:41:32 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-15 13:41:32 -0700
commit4426790c1a89e07b2a1aaa12ca66b7d7f03d396a (patch)
tree56ae6583c4f5f56283e52e2482f88bcd317c9d80 /res
parent6002de426803b901c93c76e488b31e7b560436f6 (diff)
parent4346564c1f6faefff5e0d3fdc7f189ec2e948019 (diff)
downloadpackages_apps_Browser-4426790c1a89e07b2a1aaa12ca66b7d7f03d396a.zip
packages_apps_Browser-4426790c1a89e07b2a1aaa12ca66b7d7f03d396a.tar.gz
packages_apps_Browser-4426790c1a89e07b2a1aaa12ca66b7d7f03d396a.tar.bz2
am 4346564c: Fix Google suggest and search URLs when Google Search is not installed
Merge commit '4346564c1f6faefff5e0d3fdc7f189ec2e948019' into gingerbread * commit '4346564c1f6faefff5e0d3fdc7f189ec2e948019': Fix Google suggest and search URLs when Google Search is not installed
Diffstat (limited to 'res')
-rw-r--r--res/values/all_search_engines.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/res/values/all_search_engines.xml b/res/values/all_search_engines.xml
index 3a17bd9..08cf763 100644
--- a/res/values/all_search_engines.xml
+++ b/res/values/all_search_engines.xml
@@ -206,11 +206,11 @@ http://www.opensearch.org/Specifications/OpenSearch/1.1/Draft_4#OpenSearch_1.1_p
</string-array>
<string-array name="google" translatable="false">
<item>Google</item>
- <item></item>
+ <item>google.com</item>
<item>http://www.google.com/favicon.ico</item>
- <item>{google:baseURL}search?{google:RLZ}{google:acceptedSuggestion}{google:originalQueryForSuggestion}sourceid=chrome&amp;ie={inputEncoding}&amp;q={searchTerms}</item>
+ <item>http://www.google.com/m?hl={language}&amp;ie={inputEncoding}&amp;source=android-browser&amp;q={searchTerms}</item>
<item>UTF-8</item>
- <item>{google:baseSuggestURL}search?client=chrome&amp;hl={language}&amp;q={searchTerms}</item>
+ <item>http://www.google.com/complete/search?hl={language}&amp;json=true&amp;q={searchTerms}</item>
</string-array>
<string-array name="bing_en_NZ" translatable="false">
<item>Bing</item>