summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-03-30 16:02:39 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-30 16:02:39 -0700
commite1f8294e582e61281d3a209d8972750bb25cc8f9 (patch)
treef6817e161b1c4fa18a2c61e01925003a83d1a153 /res/values
parent96497838babbaeb143b0fbc7d0de9c695e56e9f7 (diff)
parent2a3e924e6ea2096a4d6d2d283639eb6899a54a20 (diff)
downloadpackages_apps_browser-e1f8294e582e61281d3a209d8972750bb25cc8f9.zip
packages_apps_browser-e1f8294e582e61281d3a209d8972750bb25cc8f9.tar.gz
packages_apps_browser-e1f8294e582e61281d3a209d8972750bb25cc8f9.tar.bz2
Merge "Switch to HTTPS for google.com"
Diffstat (limited to 'res/values')
-rw-r--r--res/values/all_search_engines.xml6
-rw-r--r--res/values/strings.xml9
2 files changed, 5 insertions, 10 deletions
diff --git a/res/values/all_search_engines.xml b/res/values/all_search_engines.xml
index da8d3b2..e472915 100644
--- a/res/values/all_search_engines.xml
+++ b/res/values/all_search_engines.xml
@@ -207,10 +207,10 @@ http://www.opensearch.org/Specifications/OpenSearch/1.1/Draft_4#OpenSearch_1.1_p
<string-array name="google" translatable="false">
<item>Google</item>
<item>google.com</item>
- <item>http://www.google.com/favicon.ico</item>
- <item>http://www.google.com/search?ie={inputEncoding}&amp;source=android-browser&amp;q={searchTerms}</item>
+ <item>https://www.google.com/favicon.ico</item>
+ <item>https://www.google.com/search?ie={inputEncoding}&amp;source=android-browser&amp;q={searchTerms}</item>
<item>UTF-8</item>
- <item>http://www.google.com/complete/search?client=android&amp;q={searchTerms}</item>
+ <item>https://www.google.com/complete/search?client=android&amp;q={searchTerms}</item>
</string-array>
<string-array name="bing_en_NZ" translatable="false">
<item>Bing</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6afe4d5..2a7fa96 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -785,14 +785,9 @@
<!-- Do not translate. Testing only -->
<string name="dump_nav" translatable="false">Dump navigation cache</string>
- <!-- The default homepage. If it starts with "http://www.google" and the
- user signs up the device with a Google sites account, the site's
- domain will be appended. -->
+ <!-- The default homepage. -->
<string name="homepage_base" translatable="false">
- http://www.google.com/webhp?client={CID}&amp;source=android-home</string>
- <!-- The default url for the instant_base_page. -->
- <string name="instant_base" translatable="false">
- http://www.google.com/webhp?client={CID}&amp;source=android-instant&amp;ion=1</string>
+ https://www.google.com/webhp?client={CID}&amp;source=android-home</string>
<!-- Bookmarks -->
<string-array name="bookmarks" translatable="false">