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

Merge change 9704 into donut

Browse Source 
* changes:
  Close the search dialog before starting voice search in all cases, i.e., also when launching web search, not just when it's using the intent API.
This commit is contained in:
Android (Google) Code Review
2009-08-04 14:24:06 -07:00
parent 0e74f5a50b c5e7fe36fb
commit cd540294db
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -899,16 +899,15 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS
return; return;
} }
try { try {
// First stop the existing search before starting voice search, or else we'll end
// up showing the search dialog again once we return to the app.
((SearchManager) getContext().getSystemService(Context.SEARCH_SERVICE)).
stopSearch();
if (mSearchable.getVoiceSearchLaunchWebSearch()) { if (mSearchable.getVoiceSearchLaunchWebSearch()) {
getContext().startActivity(mVoiceWebSearchIntent); getContext().startActivity(mVoiceWebSearchIntent);
} else if (mSearchable.getVoiceSearchLaunchRecognizer()) { } else if (mSearchable.getVoiceSearchLaunchRecognizer()) {
Intent appSearchIntent = createVoiceAppSearchIntent(mVoiceAppSearchIntent); Intent appSearchIntent = createVoiceAppSearchIntent(mVoiceAppSearchIntent);
// Stop the existing search before starting voice search, or else we'll end
// up showing the search dialog again once we return to the app.
((SearchManager) getContext().getSystemService(Context.SEARCH_SERVICE)).
stopSearch();
getContext().startActivity(appSearchIntent); getContext().startActivity(appSearchIntent);
} }
} catch (ActivityNotFoundException e) { } catch (ActivityNotFoundException e) {