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

Commit 43cc2bac authored by Bjorn Bringert's avatar Bjorn Bringert Committed by The Android Open Source Project
Browse files

am 5f80605a: Include user query in search intents 

Merge commit '5f80605a'

* commit '5f80605a':
  Include user query in search intents
parents 5310745b 5f80605a

api/current.xml

+11 −0
Original line number Diff line number Diff line
@@ -26065,6 +26065,17 @@ 
 visibility="public"

>

</field>

<field name="USER_QUERY"

 type="java.lang.String"

 transient="false"

 volatile="false"

 value="&quot;user_query&quot;"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<interface name="SearchManager.OnCancelListener"

 abstract="true"

core/java/android/app/SearchDialog.java

+1 −0
Original line number Diff line number Diff line
@@ -1474,6 +1474,7 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS 
        if (data != null) {

            intent.setData(data);

        }

        intent.putExtra(SearchManager.USER_QUERY, mUserQuery);

        if (query != null) {

            intent.putExtra(SearchManager.QUERY, query);

        }

core/java/android/app/SearchManager.java

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

    public final static String QUERY = "query";



    /**

     * Intent extra data key: Use this key with

     * {@link android.content.Intent#getStringExtra

     *  content.Intent.getStringExtra()}

     * to obtain the query string typed in by the user.

     * This may be different from the value of {@link #QUERY}

     * if the intent is the result of selecting a suggestion.

     * In that case, {@link #QUERY} will contain the value of

     * {@link #SUGGEST_COLUMN_QUERY} for the suggestion, and

     * {@link #USER_QUERY} will contain the string typed by the

     * user.

     */

    public final static String USER_QUERY = "user_query";



    /**

     * Intent extra data key: Use this key with Intent.ACTION_SEARCH and

     * {@link android.content.Intent#getBundleExtra