diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-20 23:33:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-20 23:33:31 -0700 |
| commit | 4a38246b7a9d8900fcb80bd7848f489539147320 (patch) | |
| tree | f964d6251e5041cef485668127a13fb727126a2b /api | |
| parent | fce2972c7799784b572560a410cd7d0f9cc0d8c0 (diff) | |
| parent | 890231f1d5912f5b71371e73f44df2db2e741b1b (diff) | |
| download | frameworks_base-4a38246b7a9d8900fcb80bd7848f489539147320.zip frameworks_base-4a38246b7a9d8900fcb80bd7848f489539147320.tar.gz frameworks_base-4a38246b7a9d8900fcb80bd7848f489539147320.tar.bz2 | |
am 890231f1: Merge change 7934 into donut
Merge commit '890231f1d5912f5b71371e73f44df2db2e741b1b'
* commit '890231f1d5912f5b71371e73f44df2db2e741b1b':
Unhide new SearchManager APIs for Donut.
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.xml | 88 |
1 files changed, 88 insertions, 0 deletions
diff --git a/api/current.xml b/api/current.xml index 3e3a855..36e77dc 100644 --- a/api/current.xml +++ b/api/current.xml @@ -25978,6 +25978,28 @@ visibility="public" > </field> +<field name="EXTRA_DATA_KEY" + type="java.lang.String" + transient="false" + volatile="false" + value=""intent_extra_data_key"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="INTENT_ACTION_WEB_SEARCH_SETTINGS" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.search.action.WEB_SEARCH_SETTINGS"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="MENU_KEY" type="char" transient="false" @@ -26011,6 +26033,17 @@ visibility="public" > </field> +<field name="SHORTCUT_MIME_TYPE" + type="java.lang.String" + transient="false" + volatile="false" + value=""vnd.android.cursor.item/vnd.android.search.suggest"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="SUGGEST_COLUMN_FORMAT" type="java.lang.String" transient="false" @@ -26077,6 +26110,17 @@ visibility="public" > </field> +<field name="SUGGEST_COLUMN_INTENT_EXTRA_DATA" + type="java.lang.String" + transient="false" + volatile="false" + value=""suggest_intent_extra_data"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="SUGGEST_COLUMN_QUERY" type="java.lang.String" transient="false" @@ -26088,6 +26132,28 @@ visibility="public" > </field> +<field name="SUGGEST_COLUMN_SHORTCUT_ID" + type="java.lang.String" + transient="false" + volatile="false" + value=""suggest_shortcut_id"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="SUGGEST_COLUMN_SPINNER_WHILE_REFRESHING" + type="java.lang.String" + transient="false" + volatile="false" + value=""suggest_spinner_while_refreshing"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="SUGGEST_COLUMN_TEXT_1" type="java.lang.String" transient="false" @@ -26121,6 +26187,17 @@ visibility="public" > </field> +<field name="SUGGEST_NEVER_MAKE_SHORTCUT" + type="java.lang.String" + transient="false" + volatile="false" + value=""_-1"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="SUGGEST_URI_PATH_QUERY" type="java.lang.String" transient="false" @@ -26132,6 +26209,17 @@ visibility="public" > </field> +<field name="SUGGEST_URI_PATH_SHORTCUT" + type="java.lang.String" + transient="false" + volatile="false" + value=""search_suggest_shortcut"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="USER_QUERY" type="java.lang.String" transient="false" |