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

Commit 733f6eb1 authored by Bjorn Bringert's avatar Bjorn Bringert Committed by Android (Google) Code Review
Browse files

Merge "Add PendingIntent extra for WEB_SEARCH intents"

parents c269dc55 4519ff6a

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3726,6 +3726,7 @@ package android.app { 
    field public static final java.lang.String EXTRA_DATA_KEY = "intent_extra_data_key";

    field public static final java.lang.String EXTRA_NEW_SEARCH = "new_search";

    field public static final java.lang.String EXTRA_SELECT_QUERY = "select_query";

    field public static final java.lang.String EXTRA_WEB_SEARCH_PENDINGINTENT = "web_search_pendingintent";

    field public static final int FLAG_QUERY_REFINEMENT = 1; // 0x1

    field public static final java.lang.String INTENT_ACTION_GLOBAL_SEARCH = "android.search.action.GLOBAL_SEARCH";

    field public static final java.lang.String INTENT_ACTION_SEARCHABLES_CHANGED = "android.search.action.SEARCHABLES_CHANGED";

core/java/android/app/SearchManager.java

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

    public final static String EXTRA_NEW_SEARCH = "new_search";



    /**

     * Extra data key for {@link Intent#ACTION_WEB_SEARCH}. If set, the value must be a

     * {@link PendingIntent}. The search activity handling the {@link Intent#ACTION_WEB_SEARCH}

     * intent will fill in and launch the pending intent. The data URI will be filled in with an

     * http or https URI, and {@link android.provider.Browser#EXTRA_HEADERS} may be filled in.

     */

    public static final String EXTRA_WEB_SEARCH_PENDINGINTENT = "web_search_pendingintent";



    /**

     * Boolean extra data key for a suggestion provider to return in {@link Cursor#getExtras} to

     * indicate that the search is not complete yet. This can be used by the search UI