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

Commit 95c98dd5 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change Ie69a9c0a into eclair 

* changes:
  Remove globalSearch argument from triggerSearch()
parents f0e5ca7e b782a2f4

api/current.xml

+0 −4
Original line number Diff line number Diff line
@@ -17518,8 +17518,6 @@ 
</parameter>

<parameter name="appSearchData" type="android.os.Bundle">

</parameter>

<parameter name="globalSearch" type="boolean">

</parameter>

</method>

<method name="unregisterForContextMenu"

 return="void"
@@ -24072,8 +24070,6 @@ 
</parameter>

<parameter name="appSearchData" type="android.os.Bundle">

</parameter>

<parameter name="globalSearch" type="boolean">

</parameter>

</method>

<field name="ACTION_KEY"

 type="java.lang.String"

core/java/android/app/Activity.java

+2 −6
Original line number Diff line number Diff line
@@ -2619,14 +2619,10 @@ public class Activity extends ContextThemeWrapper 
     * context here, in order to improve quality or specificity of its own

     * searches.  This data will be returned with SEARCH intent(s).  Null if

     * no extra data is required.

     * @param globalSearch If false, this will only launch the search that has been specifically

     * defined by the application (which is usually defined as a local search).  If no default

     * search is defined in the current application or activity, no search will be launched.

     * If true, this will always launch a platform-global (e.g. web-based) search instead.

     */

    public void triggerSearch(String query, Bundle appSearchData, boolean globalSearch) {

    public void triggerSearch(String query, Bundle appSearchData) {

        ensureSearchManager();

        mSearchManager.triggerSearch(query, getComponentName(), appSearchData, globalSearch);

        mSearchManager.triggerSearch(query, getComponentName(), appSearchData);

    }



    /**

core/java/android/app/ISearchManager.aidl

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ interface ISearchManager { 
            in ComponentName launchActivity,

            in Bundle appSearchData,

            ISearchManagerCallback searchManagerCallback,

            boolean globalSearch,

            int ident);



    void stopSearch();

core/java/android/app/SearchManager.java

+2 −7
Original line number Diff line number Diff line
@@ -1785,17 +1785,12 @@ public class SearchManager 
     * context here, in order to improve quality or specificity of its own

     * searches.  This data will be returned with SEARCH intent(s).  Null if

     * no extra data is required.

     * @param globalSearch If false, this will only launch the search that has been specifically

     * defined by the application (which is usually defined as a local search).  If no default

     * search is defined in the current application or activity, no search will be launched.

     * If true, this will always launch a platform-global (e.g. web-based) search instead.

     *

     * @see #startSearch

     */

    public void triggerSearch(String query,

                              ComponentName launchActivity,

                              Bundle appSearchData,

                              boolean globalSearch) {

                              Bundle appSearchData) {

        if (mIdent == 0) throw new IllegalArgumentException(

                "Called from outside of an Activity context");

        if (!mAssociatedPackage.equals(launchActivity.getPackageName())) {
@@ -1808,7 +1803,7 @@ public class SearchManager 
        }

        try {

            mService.triggerSearch(query, launchActivity, appSearchData, mSearchManagerCallback,

                    globalSearch, mIdent);

                    mIdent);

        } catch (RemoteException ex) {

            Log.e(TAG, "triggerSearch() failed.", ex);

        }

core/java/android/server/search/SearchManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -247,14 +247,13 @@ public class SearchManagerService extends ISearchManager.Stub { 
            ComponentName launchActivity,

            Bundle appSearchData,

            ISearchManagerCallback searchManagerCallback,

            boolean globalSearch,

            int ident) {

        getSearchDialog().startSearch(

                query,

                false,

                launchActivity,

                appSearchData,

                globalSearch,

                false,

                searchManagerCallback,

                ident,

                true); // triger search after launching