diff options
| author | Leon Scroggins III <scroggo@google.com> | 2010-09-14 10:57:37 -0400 |
|---|---|---|
| committer | Leon Scroggins III <scroggo@google.com> | 2010-09-14 13:07:43 -0400 |
| commit | 430057dad085f3c3dbc386f127b1f5a10a9851da (patch) | |
| tree | 3fd53a66a26a9ce37572a37a1260fc948b45571e /src/com/android/browser/BrowserActivity.java | |
| parent | d26706538834e0ed58bf28f08d9a2885c0e7efcb (diff) | |
| download | packages_apps_Browser-430057dad085f3c3dbc386f127b1f5a10a9851da.tar.gz packages_apps_Browser-430057dad085f3c3dbc386f127b1f5a10a9851da.tar.bz2 packages_apps_Browser-430057dad085f3c3dbc386f127b1f5a10a9851da.zip | |
Fixes for changing the search engine.
Provide a default value for the Select search engine preference.
Move the Select search engine preference into advanced settings.
When opening the SearchDialog with a SearchEngine other than
Google, add a flag to hide the voice search icon.
Depends on a change to frameworks/base.
Change-Id: I6da2e582789253b3c5ffac9fe1ad3732f99f28ea
Diffstat (limited to 'src/com/android/browser/BrowserActivity.java')
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index 6f477882a..5583466e5 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -1185,6 +1185,12 @@ public class BrowserActivity extends Activity if (appSearchData == null) { appSearchData = createGoogleSearchSourceBundle(GOOGLE_SEARCH_SOURCE_TYPE); } + + SearchEngine searchEngine = mSettings.getSearchEngine(); + if (searchEngine != null && !searchEngine.supportsVoiceSearch()) { + appSearchData.putBoolean(SearchManager.DISABLE_VOICE_SEARCH, true); + } + super.startSearch(initialQuery, selectInitialQuery, appSearchData, globalSearch); } |