Update google_search_base for chinese language.
Changed default search base for china to be www.google.cn and changed the language param.
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java
index 9d5130f..a3a84fb 100644
--- a/src/com/android/browser/BrowserActivity.java
+++ b/src/com/android/browser/BrowserActivity.java
@@ -4487,9 +4487,26 @@
* mcc-specific xml files.)
*/
Locale l = Locale.getDefault();
+ String language = l.getLanguage();
+ String country = l.getCountry().toLowerCase();
+ // Chinese and Portuguese have two langauge variants.
+ if ("zh".equals(language)) {
+ if ("cn".equals(country)) {
+ language = "zh-CN";
+ } else if ("tw".equals(country)) {
+ language = "zh-TW";
+ }
+ } else if ("pt".equals(language)) {
+ if ("br".equals(country)) {
+ language = "pt-BR";
+ } else if ("pt".equals(country)) {
+ language = "pt-PT";
+ }
+ }
QuickSearch_G = getResources().getString(
- R.string.google_search_base, l.getLanguage(),
- l.getCountry().toLowerCase())
+ R.string.google_search_base,
+ language,
+ country)
+ "client=ms-"
+ Partner.getString(this.getContentResolver(), Partner.CLIENT_ID)
+ "&source=android-" + GOOGLE_SEARCH_SOURCE_SUGGEST + "&q=%s";