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

Commit f0fb68d8 authored by Michael Jurka's avatar Michael Jurka Committed by Android (Google) Code Review
Browse files

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

parents e060fadb 3f5cfcf2

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -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";

























core/java/android/app/SearchManager.java



+1
−7




























Original line number
Diff line number
Diff line








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