From 4a028009468a95e932fc4fcd9ccdd358e02b1b0a Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Tue, 14 Sep 2010 10:56:25 -0400 Subject: [PATCH] Add an option to hide the Voice Search icon. Some search engines do not support voice search, so provide a flag to disable showing the icon in the SearchDialog. Change-Id: I7ef4ad5d382edb86c08014260defa4af6d5eca0a --- core/java/android/app/SearchDialog.java | 4 +++- core/java/android/app/SearchManager.java | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java index 7625c04d61e23..cd22fa13e0151 100644 --- a/core/java/android/app/SearchDialog.java +++ b/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; diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java index a1ca707ab7b9c..2e9cd96f2695b 100644 --- a/core/java/android/app/SearchManager.java +++ b/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. */