drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Leon Scroggins III
2010-09-14 10:21:25 -07:00
committed by Android (Google) Code Review
parent 4b4af990af 4a02800946
commit ca8f3d0428
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) { 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;

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"; 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.
*/ */