Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 901b7b9b authored Sep 14, 2010 by Leon Scroggins III Committed by Android Git Automerger Sep 14, 2010

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

Merge commit 'ca8f3d04' into gingerbread

* commit 'ca8f3d04':
  Add an option to hide the Voice Search icon.

parents 89a7180a ca8f3d04

core/java/android/app/SearchDialog.java

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -588,7 +588,9 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
	*/		*/
	private void updateVoiceButton(boolean empty) {		private void updateVoiceButton(boolean empty) {
	int visibility = View.GONE;		int visibility = View.GONE;
	if (mSearchable.getVoiceSearchEnabled() && empty) {		if ((mAppSearchData == null \|\| !mAppSearchData.getBoolean(
			SearchManager.DISABLE_VOICE_SEARCH, false))
			&& mSearchable.getVoiceSearchEnabled() && empty) {
	Intent testIntent = null;		Intent testIntent = null;
	if (mSearchable.getVoiceSearchLaunchWebSearch()) {		if (mSearchable.getVoiceSearchLaunchWebSearch()) {
	testIntent = mVoiceWebSearchIntent;		testIntent = mVoiceWebSearchIntent;

core/java/android/app/SearchManager.java

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -394,6 +394,14 @@ public class SearchManager
	*/		*/
	public final static String CONTEXT_IS_VOICE = "android.search.CONTEXT_IS_VOICE";		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.		* Reference to the shared system search service.
	*/		*/