diff options
| author | Leon Scroggins III <scroggo@google.com> | 2010-09-15 11:36:40 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 11:36:40 -0700 |
| commit | aad8c860666ce35d91874e8cac7fb97e88f2e58c (patch) | |
| tree | 6fd080a57858350c705418c0b412834e94ed730c /src/com/android/browser/BrowserActivity.java | |
| parent | c235db82a0ac3a6c7f23920b5d0e8d6ba38405c9 (diff) | |
| parent | 6ac51e2b2defbc33834ec92d8a3e7c904f20811e (diff) | |
am 6ac51e2b: am 867c0465: am 430057da: Fixes for changing the search engine.
Merge commit '6ac51e2b2defbc33834ec92d8a3e7c904f20811e'
* commit '6ac51e2b2defbc33834ec92d8a3e7c904f20811e':
Fixes for changing the search engine.
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 55898499..e1e1e18a 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -1215,6 +1215,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); } |