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

Commit c5e7fe36 authored by Mike LeBeau's avatar Mike LeBeau
Browse files

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.
parent c134c281

core/java/android/app/SearchDialog.java

+6 −7
Original line number Diff line number Diff line
@@ -899,16 +899,15 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
                return;

            }

            try {

                if (mSearchable.getVoiceSearchLaunchWebSearch()) {

                    getContext().startActivity(mVoiceWebSearchIntent);

                } else if (mSearchable.getVoiceSearchLaunchRecognizer()) {

                    Intent appSearchIntent = createVoiceAppSearchIntent(mVoiceAppSearchIntent);

                    

                    // Stop the existing search before starting voice search, or else we'll end

                // 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()) {

                    getContext().startActivity(mVoiceWebSearchIntent);

                } else if (mSearchable.getVoiceSearchLaunchRecognizer()) {

                    Intent appSearchIntent = createVoiceAppSearchIntent(mVoiceAppSearchIntent);                    

                    getContext().startActivity(appSearchIntent);

                }

            } catch (ActivityNotFoundException e) {