diff options
author | luxiaol <luxiaol@codeaurora.org> | 2013-07-19 15:27:57 +0800 |
---|---|---|
committer | kaiyiz <kaiyiz@codeaurora.org> | 2013-08-14 17:38:48 +0800 |
commit | 221b39319bba85bc56020c4f1f90a86b75ccab10 (patch) | |
tree | 3c9631a80141f15af59cf58920aa58ff4f861071 /src/com/android/browser/search | |
parent | 3875e5782dcf26df18427d295bec06a312dd306b (diff) | |
download | android_packages_apps_Gello-221b39319bba85bc56020c4f1f90a86b75ccab10.tar.gz android_packages_apps_Gello-221b39319bba85bc56020c4f1f90a86b75ccab10.tar.bz2 android_packages_apps_Gello-221b39319bba85bc56020c4f1f90a86b75ccab10.zip |
Browser: add to support search engine preset
1. Set Baidu search engine as the default search engine.
2. Add 139 search engine for carrier.
CRs-fixed: 507955
Change-Id: Idccc86f2d9ac439dcfff5f65e853bb4618fed361
Diffstat (limited to 'src/com/android/browser/search')
-rw-r--r-- | src/com/android/browser/search/SearchEnginePreference.java | 10 | ||||
-rw-r--r-- | src/com/android/browser/search/SearchEngines.java | 11 |
2 files changed, 18 insertions, 3 deletions
diff --git a/src/com/android/browser/search/SearchEnginePreference.java b/src/com/android/browser/search/SearchEnginePreference.java index 18ce4957..62ce97bc 100644 --- a/src/com/android/browser/search/SearchEnginePreference.java +++ b/src/com/android/browser/search/SearchEnginePreference.java @@ -57,6 +57,14 @@ class SearchEnginePreference extends ListPreference { setEntryValues(entryValues.toArray(new CharSequence[entryValues.size()])); setEntries(entries.toArray(new CharSequence[entries.size()])); - } + //for other language the default search engine is google,but for English and + //Chinese the default search engine should be Baidu. + String language = context.getResources().getConfiguration().locale.toString(); + if (language.equals("zh_CN")) { + setDefaultValue("baidu_cn"); + } else if (language.equals("en_US")) { + setDefaultValue("baidu"); + } + } } diff --git a/src/com/android/browser/search/SearchEngines.java b/src/com/android/browser/search/SearchEngines.java index 433e8770..2484ce01 100644 --- a/src/com/android/browser/search/SearchEngines.java +++ b/src/com/android/browser/search/SearchEngines.java @@ -19,6 +19,7 @@ import com.android.browser.R; import android.content.Context; import android.content.res.Resources; +import android.os.SystemProperties; import android.text.TextUtils; import android.util.Log; @@ -37,10 +38,16 @@ public class SearchEngines { ArrayList<SearchEngineInfo> searchEngineInfos = new ArrayList<SearchEngineInfo>(); Resources res = context.getResources(); String[] searchEngines = res.getStringArray(R.array.search_engines); + String browserRes = SystemProperties.get("persist.env.c.browser.resource", "default"); for (int i = 0; i < searchEngines.length; i++) { String name = searchEngines[i]; - SearchEngineInfo info = new SearchEngineInfo(context, name); - searchEngineInfos.add(info); + if ("cmcc".equals(browserRes)) { + SearchEngineInfo info = new SearchEngineInfo(context, name); + searchEngineInfos.add(info); + } else if (!name.startsWith("cmcc")) { + SearchEngineInfo info = new SearchEngineInfo(context, name); + searchEngineInfos.add(info); + } } return searchEngineInfos; } |