commit f6fff20a96268b0b1136a2c44199ad8de46ced5d
author Bjorn Bringert <bringert@android.com> Thu Jan 14 13:01:01 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 14 13:01:01 2010 -0800
tree 118522c9e3f29a88f7f2292bdf7e80e562b37579
parent 66ef01e23288eb93bf410823b7fdc123fd9c5197
parent 55f3ac5f293e78618995202274f8555f2481994d

Merge "Expose SearchManager constants for global search"

api/current.xml

diff --git a/api/current.xml b/api/current.xml
index 113b9e0..96e7fd6 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -23927,6 +23927,28 @@
  visibility="public"
 >
 </field>
+<field name="EXTRA_SELECT_QUERY"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;select_query&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
+<field name="INTENT_ACTION_GLOBAL_SEARCH"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;android.search.action.GLOBAL_SEARCH&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="INTENT_ACTION_SEARCHABLES_CHANGED"
  type="java.lang.String"
  transient="false"

core/java/android/app/SearchManager.java

diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java
index 9112be4..981145b 100644
--- a/core/java/android/app/SearchManager.java
+++ b/core/java/android/app/SearchManager.java
@@ -1332,20 +1332,11 @@
     public final static String EXTRA_DATA_KEY = "intent_extra_data_key";
 
     /**
-     * String extra data key for {@link #INTENT_ACTION_GLOBAL_SEARCH} intents. Contains the initial
-     * query to show in the global search activity.
-     *
-     * @hide Pending API council approval
+     * Boolean extra data key for {@link #INTENT_ACTION_GLOBAL_SEARCH} intents. If {@code true},
+     * the initial query should be selected when the global search activity is started, so
+     * that the user can easily replace it with another query.
      */
-    public final static String INITIAL_QUERY = "initial_query";
-
-    /**
-     * Boolean extra data key for {@link Intent#INTENT_ACTION_GLOBAL_SEARCH} intents. If {@code true},
-     * the initial query should be selected.
-     *
-     * @hide Pending API council approval
-     */
-    public final static String SELECT_INITIAL_QUERY = "select_initial_query";
+    public final static String EXTRA_SELECT_QUERY = "select_query";
 
     /**
      * Defines the constants used in the communication between {@link android.app.SearchDialog} and
@@ -1643,10 +1634,12 @@
             = "android.search.action.CHANGE_SEARCH_SOURCE";
 
     /**
-     * Intent action for finding the global search activity.
+     * Intent action for starting the global search activity.
      * The global search provider should handle this intent.
-     * 
-     * @hide Pending API council approval.
+     *
+     * Supported extra data keys: {@link #QUERY},
+     * {@link #EXTRA_SELECT_QUERY},
+     * {@link #APP_DATA}.
      */
     public final static String INTENT_ACTION_GLOBAL_SEARCH 
             = "android.search.action.GLOBAL_SEARCH";
@@ -1823,10 +1816,10 @@
             intent.putExtra(APP_DATA, appSearchData);
         }
         if (!TextUtils.isEmpty(initialQuery)) {
-            intent.putExtra(INITIAL_QUERY, initialQuery);
+            intent.putExtra(QUERY, initialQuery);
         }
         if (selectInitialQuery) {
-            intent.putExtra(SELECT_INITIAL_QUERY, selectInitialQuery);
+            intent.putExtra(EXTRA_SELECT_QUERY, selectInitialQuery);
         }
         try {
             if (DBG) Log.d(TAG, "Starting global search: " + intent.toUri(0));