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

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

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

parents 4b4af990 4a028009

core/java/android/app/SearchDialog.java

+3 −1
Original line number Diff line number Diff line
@@ -588,7 +588,9 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
     */

    private void updateVoiceButton(boolean empty) {

        int visibility = View.GONE;

        if (mSearchable.getVoiceSearchEnabled() && empty) {

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

                SearchManager.DISABLE_VOICE_SEARCH, false))

                && mSearchable.getVoiceSearchEnabled() && empty) {

            Intent testIntent = null;

            if (mSearchable.getVoiceSearchLaunchWebSearch()) {

                testIntent = mVoiceWebSearchIntent;

core/java/android/app/SearchManager.java

+8 −0
Original line number Diff line number Diff line
@@ -394,6 +394,14 @@ public class SearchManager 
     */

    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.

     */