diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-04 06:10:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-04 06:10:37 -0700 |
| commit | f762589d1fb2b0c191cfcd96de4fbe6044d7f52a (patch) | |
| tree | bbcfdf4127b0422f41174579b05078a81b60c4db /core/java | |
| parent | c08fc64ff6bca9658c2addcb8ca63ee35bf5464e (diff) | |
| parent | 3a27803b29dc739685e1e2465a0ca697e4b60d14 (diff) | |
| download | frameworks_base-f762589d1fb2b0c191cfcd96de4fbe6044d7f52a.zip frameworks_base-f762589d1fb2b0c191cfcd96de4fbe6044d7f52a.tar.gz frameworks_base-f762589d1fb2b0c191cfcd96de4fbe6044d7f52a.tar.bz2 | |
Merge change 3145 into donut
* changes:
Add INTENT_ACTION_WEB_SEARCH_SETTINGS (thereby fixing the build too :)).
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/SearchManager.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java index b4a3a78..f607db9 100644 --- a/core/java/android/app/SearchManager.java +++ b/core/java/android/app/SearchManager.java @@ -1415,6 +1415,16 @@ public class SearchManager */ public final static String INTENT_ACTION_SEARCH_SETTINGS = "android.search.action.SEARCH_SETTINGS"; + + /** + * Intent action for starting a web search provider's settings activity. + * Web search providers should handle this intent if they have provider-specific + * settings to implement. + * + * @hide Pending API council approval. + */ + public final static String INTENT_ACTION_WEB_SEARCH_SETTINGS + = "android.search.action.WEB_SEARCH_SETTINGS"; /** * If a suggestion has this value in {@link #SUGGEST_COLUMN_INTENT_ACTION}, |