Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b' into gingerbread-plus-aosp

* commit '901b7b9b17d20dc8085fb5fd3bab0f0804f3906b':
  Add an option to hide the Voice Search icon.
This commit is contained in:
Leon Scroggins III
2010-09-14 10:26:44 -07:00
committed by Android Git Automerger
parent 188a8f1b72 901b7b9b17
commit 720d5985f5
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/SearchDialog.java
View File

@@ -588,7 +588,9 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
*/
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;

8
core/java/android/app/SearchManager.java
View File

@@ -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.
*/