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

Commit 49658cb5 authored by Leon Scroggins's avatar Leon Scroggins Committed by Android (Google) Code Review
Browse files

Merge "When context is voice, show the microphone."

parents 6069beb2 4f22a545

core/java/android/app/SearchDialog.java

+4 −1
Original line number Diff line number Diff line
@@ -668,7 +668,10 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
                // The user changed the query, remember it.

                mUserQuery = s == null ? "" : s.toString();

            }

            updateVoiceButton(mSearchAutoComplete.isEmpty());

            // Always want to show the microphone if the context is voice.

            updateVoiceButton(mSearchAutoComplete.isEmpty()

                    || (mAppSearchData != null && mAppSearchData.getBoolean(

                    SearchManager.CONTEXT_IS_VOICE)));

        }



        public void afterTextChanged(Editable s) {

core/java/android/app/SearchManager.java

+9 −0
Original line number Diff line number Diff line
@@ -1543,6 +1543,15 @@ public class SearchManager 
     */

    public final static String INTENT_ACTION_NONE = "android.search.action.ZILCH";



    /**

     * This means that context is voice, and therefore the SearchDialog should

     * continue showing the microphone until the user indicates that he/she does

     * not want to re-speak (e.g. by typing).

     *

     * @hide

     */

    public final static String CONTEXT_IS_VOICE = "android.search.CONTEXT_IS_VOICE";



    /**

     * Reference to the shared system search service.

     */