summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/BrowserSettings.java
diff options
context:
space:
mode:
authorluxiaol <luxiaol@codeaurora.org>2013-07-19 15:27:57 +0800
committerkaiyiz <kaiyiz@codeaurora.org>2013-08-14 17:38:48 +0800
commit221b39319bba85bc56020c4f1f90a86b75ccab10 (patch)
tree3c9631a80141f15af59cf58920aa58ff4f861071 /src/com/android/browser/BrowserSettings.java
parent3875e5782dcf26df18427d295bec06a312dd306b (diff)
downloadandroid_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/BrowserSettings.java')
-rw-r--r--src/com/android/browser/BrowserSettings.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 17e20017..0b415be3 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -757,7 +757,11 @@ public class BrowserSettings implements OnSharedPreferenceChangeListener,
// -----------------------------
public String getSearchEngineName() {
- return mPrefs.getString(PREF_SEARCH_ENGINE, SearchEngine.GOOGLE);
+ String defaultSearchEngineValue = mContext.getString(R.string.default_search_engine_value);
+ if (defaultSearchEngineValue == null) {
+ defaultSearchEngineValue = SearchEngine.GOOGLE;
+ }
+ return mPrefs.getString(PREF_SEARCH_ENGINE, defaultSearchEngineValue);
}
public boolean allowAppTabs() {