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

Merge "Remove Intent.ACTION_GLOBAL_SEARCH"

Browse Source
This commit is contained in:
Bjorn Bringert
2010-01-14 02:26:50 -08:00
committed by Android (Google) Code Review
parent 7f6528113c a94e7afb28
commit 80d3091b99
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1332,7 +1332,7 @@ public class SearchManager
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
* 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
@@ -1340,7 +1340,7 @@ public class SearchManager
public final static String INITIAL_QUERY = "initial_query";
/**
* Boolean extra data key for {@link Intent#ACTION_GLOBAL_SEARCH} intents. If {@code true},
* 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
@@ -1816,7 +1816,7 @@ public class SearchManager
Log.w(TAG, "No global search activity found.");
return;
}
Intent intent = new Intent(Intent.ACTION_GLOBAL_SEARCH);
Intent intent = new Intent(INTENT_ACTION_GLOBAL_SEARCH);
intent.setComponent(globalSearchActivity);
// TODO: Always pass name of calling package as an extra?
if (appSearchData != null) {
@@ -1847,7 +1847,7 @@ public class SearchManager
* we have settled on the right mechanism for finding the global search activity.
*/
private ComponentName getGlobalSearchActivity() {
Intent intent = new Intent(Intent.ACTION_GLOBAL_SEARCH);
Intent intent = new Intent(INTENT_ACTION_GLOBAL_SEARCH);
PackageManager pm = mContext.getPackageManager();
List<ResolveInfo> activities =
pm.queryIntentActivities(intent, PackageManager.MATCH_DEFAULT_ONLY);

10
core/java/android/content/Intent.java
View File

@@ -1101,16 +1101,6 @@ public class Intent implements Parcelable, Cloneable {
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
public static final String ACTION_SEARCH_LONG_PRESS = "android.intent.action.SEARCH_LONG_PRESS";
/**
* Activity Action: Start the global search activity.
* <p>Input: Nothing.
* <p>Output: Nothing.
*
* @hide Pending API council approval
*/
@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
public static final String ACTION_GLOBAL_SEARCH = "android.intent.action.GLOBAL_SEARCH";
/**
* Activity Action: The user pressed the "Report" button in the crash/ANR dialog.
* This intent is delivered to the package which installed the application, usually