Merge "Add an option to hide the Voice Search icon." into froyo

Author: LeonScroggins

core/java/android/app/SearchDialog.java

@@ -588,7 +588,9 @@ private void updateQueryHint() {
      */
     private void updateVoiceButton(boolean empty) {
         int visibility = View.GONE;
-        if (mSearchable.getVoiceSearchEnabled() && empty) {
+        if ((mAppSearchData == null || !mAppSearchData.getBoolean(
+                SearchManager.DISABLE_VOICE_SEARCH, false))
+                && mSearchable.getVoiceSearchEnabled() && empty) {
             Intent testIntent = null;
             if (mSearchable.getVoiceSearchLaunchWebSearch()) {
                 testIntent = mVoiceWebSearchIntent;

core/java/android/app/SearchManager.java

@@ -394,6 +394,14 @@ public class SearchManager
      */
     public final static String CONTEXT_IS_VOICE = "android.search.CONTEXT_IS_VOICE";
 
+    /**
+     * This means that the voice icon should not be shown at all, because the
+     * current search engine does not support voice search.
+     * @hide
+     */
+    public final static String DISABLE_VOICE_SEARCH
+            = "android.search.DISABLE_VOICE_SEARCH";
+
     /**
      * Reference to the shared system search service.
      */