commit 736990cb9c57a346666d4424304947c21fb78ab7
author Michael Kolb <kolby@google.com> Sun Mar 20 10:01:20 2011 -0700
committer Michael Kolb <kolby@google.com> Sun Mar 20 10:01:20 2011 -0700
tree f1c86713ac04fa19303f4bf79e429e89838d26b4
parent 1421c40e43eb7c35a8c326a80981ba85c9d46273

unify voice search code

Change-Id: Icf1fc84405d08da8504ac91094e67c7d8d1c901d

src/com/android/browser/TitleBarXLarge.java

diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index 5f02002..ee46561 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -18,9 +18,7 @@
 
 import com.android.browser.UI.DropdownChangeListener;
 import com.android.browser.autocomplete.SuggestedTextController.TextChangeWatcher;
-import com.android.browser.search.SearchEngine;
 
-import android.accounts.Account;
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources;
@@ -477,10 +475,8 @@
     }
 
     private void setSearchMode(boolean voiceSearchEnabled) {
-        SearchEngine searchEngine = BrowserSettings.getInstance()
-                .getSearchEngine();
         boolean showvoicebutton = voiceSearchEnabled &&
-                (searchEngine != null && searchEngine.supportsVoiceSearch());
+                mUiController.supportsVoiceSearch();
         mVoiceSearch.setVisibility(showvoicebutton ? View.VISIBLE :
                 View.GONE);
         mGoButton.setVisibility(voiceSearchEnabled ? View.GONE :