diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2009-08-21 12:59:04 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2009-08-21 12:59:04 -0700 |
| commit | dd03c6135f91df6d5d9e71de1487520dc3345742 (patch) | |
| tree | c4948e1ca876b218b8c50abd6171ad2be10396cd /api | |
| parent | bfcfb7eec61bd196cfd91f7b2c5715751308c048 (diff) | |
| parent | 081a136d259c02b2ab8ba773c38e404f7b3c3de4 (diff) | |
| download | frameworks_base-dd03c6135f91df6d5d9e71de1487520dc3345742.zip frameworks_base-dd03c6135f91df6d5d9e71de1487520dc3345742.tar.gz frameworks_base-dd03c6135f91df6d5d9e71de1487520dc3345742.tar.bz2 | |
resolved conflicts for merge of 081a136d to eclair
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.xml | 110 |
1 files changed, 0 insertions, 110 deletions
diff --git a/api/current.xml b/api/current.xml index 805917b..7fad505 100644 --- a/api/current.xml +++ b/api/current.xml @@ -4200,17 +4200,6 @@ visibility="public" > </field> -<field name="includeInGlobalSearch" - type="int" - transient="false" - volatile="false" - value="16843374" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> <field name="indeterminate" type="int" transient="false" @@ -6279,17 +6268,6 @@ visibility="public" > </field> -<field name="queryAfterZeroResults" - type="int" - transient="false" - volatile="false" - value="16843394" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> <field name="radioButtonStyle" type="int" transient="false" @@ -6785,17 +6763,6 @@ visibility="public" > </field> -<field name="searchSettingsDescription" - type="int" - transient="false" - volatile="false" - value="16843402" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> <field name="searchSuggestAuthority" type="int" transient="false" @@ -6851,17 +6818,6 @@ visibility="public" > </field> -<field name="searchSuggestThreshold" - type="int" - transient="false" - volatile="false" - value="16843373" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> <field name="secondaryProgress" type="int" transient="false" @@ -23471,17 +23427,6 @@ 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" @@ -23515,17 +23460,6 @@ 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" @@ -23614,28 +23548,6 @@ 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" @@ -23669,17 +23581,6 @@ 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" @@ -23691,17 +23592,6 @@ 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" |