From 3f5cfcf2d9d60bf12127dee3be54faaf7150ff69 Mon Sep 17 00:00:00 2001 From: Michael Jurka Date: Fri, 27 Apr 2012 14:20:59 -0700 Subject: [PATCH] Make APIs to get global search provider public --- api/current.txt | 2 ++ core/java/android/app/SearchManager.java | 8 +------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/api/current.txt b/api/current.txt index d04025c2653e2..2633a0b39f1ea 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3870,6 +3870,7 @@ package android.app { } public class SearchManager implements android.content.DialogInterface.OnCancelListener android.content.DialogInterface.OnDismissListener { + method public android.content.ComponentName getGlobalSearchActivity(); method public android.app.SearchableInfo getSearchableInfo(android.content.ComponentName); method public java.util.List getSearchablesInGlobalSearch(); method public deprecated void onCancel(android.content.DialogInterface); @@ -3893,6 +3894,7 @@ package android.app { field public static final java.lang.String INTENT_ACTION_SEARCH_SETTINGS = "android.search.action.SEARCH_SETTINGS"; field public static final java.lang.String INTENT_ACTION_SEARCH_SETTINGS_CHANGED = "android.search.action.SETTINGS_CHANGED"; field public static final java.lang.String INTENT_ACTION_WEB_SEARCH_SETTINGS = "android.search.action.WEB_SEARCH_SETTINGS"; + field public static final java.lang.String INTENT_GLOBAL_SEARCH_ACTIVITY_CHANGED = "android.search.action.GLOBAL_SEARCH_ACTIVITY_CHANGED"; field public static final char MENU_KEY = 115; // 0x0073 's' field public static final int MENU_KEYCODE = 47; // 0x2f field public static final java.lang.String QUERY = "query"; diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java index 2ff45fb5ab1d7..691ee301cd001 100644 --- a/core/java/android/app/SearchManager.java +++ b/core/java/android/app/SearchManager.java @@ -395,11 +395,7 @@ public class SearchManager /** * Intent action to be broadcast to inform that the global search provider - * has changed. Normal components will have no need to handle this intent since - * they should be using API methods from this class to access the global search - * activity - * - * @hide + * has changed. */ public final static String INTENT_GLOBAL_SEARCH_ACTIVITY_CHANGED = "android.search.action.GLOBAL_SEARCH_ACTIVITY_CHANGED"; @@ -590,8 +586,6 @@ public class SearchManager /** * Gets the name of the global search activity. - * - * @hide */ public ComponentName getGlobalSearchActivity() { try {