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

Remove the mic from the keyboard in SearchView

Browse Source 
Bug: 5357750
Change-Id: I20c87a25e95222772c6b5154d09dd681b966fd9a
This commit is contained in:
Luca Zanolin
2011-10-06 13:36:15 +01:00
parent ca35bc5acc
commit 535698c57d
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/widget/SearchView.java
View File

@@ -92,6 +92,11 @@ public class SearchView extends LinearLayout implements CollapsibleActionView {
private static final boolean DBG = false; private static final boolean DBG = false;
private static final String LOG_TAG = "SearchView"; private static final String LOG_TAG = "SearchView";
/**
* Private constant for removing the microphone in the keyboard.
*/
private static final String IME_OPTION_NO_MICROPHONE = "nm";
private OnQueryTextListener mOnQueryChangeListener; private OnQueryTextListener mOnQueryChangeListener;
private OnCloseListener mOnCloseListener; private OnCloseListener mOnCloseListener;
private OnFocusChangeListener mOnQueryTextFocusChangeListener; private OnFocusChangeListener mOnQueryTextFocusChangeListener;
@@ -256,7 +261,7 @@ public class SearchView extends LinearLayout implements CollapsibleActionView {
mQueryTextView.setOnItemClickListener(mOnItemClickListener); mQueryTextView.setOnItemClickListener(mOnItemClickListener);
mQueryTextView.setOnItemSelectedListener(mOnItemSelectedListener); mQueryTextView.setOnItemSelectedListener(mOnItemSelectedListener);
mQueryTextView.setOnKeyListener(mTextKeyListener); mQueryTextView.setOnKeyListener(mTextKeyListener);
// Inform any listener of focus changes // Inform any listener of focus changes
mQueryTextView.setOnFocusChangeListener(new OnFocusChangeListener() { mQueryTextView.setOnFocusChangeListener(new OnFocusChangeListener() {
public void onFocusChange(View v, boolean hasFocus) { public void onFocusChange(View v, boolean hasFocus) {
@@ -335,6 +340,12 @@ public class SearchView extends LinearLayout implements CollapsibleActionView {
} }
// Cache the voice search capability // Cache the voice search capability
mVoiceButtonEnabled = hasVoiceSearch(); mVoiceButtonEnabled = hasVoiceSearch();
if (mVoiceButtonEnabled) {
// Disable the microphone on the keyboard, as a mic is displayed near the text box
// TODO: use imeOptions to disable voice input when the new API will be available
mQueryTextView.setPrivateImeOptions(IME_OPTION_NO_MICROPHONE);
}
updateViewsVisibility(isIconified()); updateViewsVisibility(isIconified());
} }