commit e4e82f2782e61658256ecb85066e273c22a37951
author Bjorn Bringert <bringert@android.com> Wed Feb 10 13:22:55 2010 +0000
committer Bjorn Bringert <bringert@android.com> Wed Feb 10 21:30:29 2010 +0000
tree 4b942c538f0972216f6508cfe3be52262bb40f2f
parent 23897c16a603748db83c59a280b6e6079bf57175

Unhide SearchManager.INTENT_ACTION_SEARCH_SETTINGS

This intent action is needed by Settings to start the search settings
activity which lives in QuickSearchBox / GoogleQuickSearchBox.

Fixes http://b/issue?id=2394530

Change-Id: Iea2a7d9df0092459e5618986f4f789f9257f912a

api/current.xml

diff --git a/api/current.xml b/api/current.xml
index 47033c5..4b190060 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -24897,6 +24897,17 @@
  visibility="public"
 >
 </field>
+<field name="INTENT_ACTION_SEARCH_SETTINGS"
+ type="java.lang.String"
+ transient="false"
+ volatile="false"
+ value="&quot;android.search.action.SEARCH_SETTINGS&quot;"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="INTENT_ACTION_SEARCH_SETTINGS_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 5a295b4e..5a9a675 100644
--- a/core/java/android/app/SearchManager.java
+++ b/core/java/android/app/SearchManager.java
@@ -1628,8 +1628,6 @@
     /**
      * Intent action for starting the global search settings activity.
      * The global search provider should handle this intent.
-     * 
-     * @hide Pending API council approval.
      */
     public final static String INTENT_ACTION_SEARCH_SETTINGS 
             = "android.search.action.SEARCH_SETTINGS";