Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make APIs to get global search provider public" into jb-dev

Browse Source
This commit is contained in:
Michael Jurka
2012-04-27 14:41:27 -07:00
committed by Android (Google) Code Review
parent e060fadbef 3f5cfcf2d9
commit f0fb68d8c9
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -3871,6 +3871,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<android.app.SearchableInfo> getSearchablesInGlobalSearch();
method public deprecated void onCancel(android.content.DialogInterface);
@@ -3894,6 +3895,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";

8
core/java/android/app/SearchManager.java
View File

@@ -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 {