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

Merge change 7934 into donut

Browse Source 
* changes:
  Unhide new SearchManager APIs for Donut.
This commit is contained in:
Android (Google) Code Review
2009-07-20 17:15:07 -07:00
parent 3b5449e902 131234c6f1
commit 890231f1d5
2 changed files with 89 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
api/current.xml
View File

@@ -23732,6 +23732,28 @@
visibility="public"
>
</field>
<field name="EXTRA_DATA_KEY"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;intent_extra_data_key&quot;"
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="&quot;android.search.action.WEB_SEARCH_SETTINGS&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="MENU_KEY"
type="char"
transient="false"
@@ -23765,6 +23787,17 @@
visibility="public"
>
</field>
<field name="SHORTCUT_MIME_TYPE"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;vnd.android.cursor.item/vnd.android.search.suggest&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SUGGEST_COLUMN_FORMAT"
type="java.lang.String"
transient="false"
@@ -23831,6 +23864,17 @@
visibility="public"
>
</field>
<field name="SUGGEST_COLUMN_INTENT_EXTRA_DATA"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;suggest_intent_extra_data&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SUGGEST_COLUMN_QUERY"
type="java.lang.String"
transient="false"
@@ -23842,6 +23886,28 @@
visibility="public"
>
</field>
<field name="SUGGEST_COLUMN_SHORTCUT_ID"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;suggest_shortcut_id&quot;"
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="&quot;suggest_spinner_while_refreshing&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SUGGEST_COLUMN_TEXT_1"
type="java.lang.String"
transient="false"
@@ -23875,6 +23941,17 @@
visibility="public"
>
</field>
<field name="SUGGEST_NEVER_MAKE_SHORTCUT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;_-1&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="SUGGEST_URI_PATH_QUERY"
type="java.lang.String"
transient="false"
@@ -23886,6 +23963,17 @@
visibility="public"
>
</field>
<field name="SUGGEST_URI_PATH_SHORTCUT"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;search_suggest_shortcut&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="USER_QUERY"
type="java.lang.String"
transient="false"

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

@@ -1188,8 +1188,6 @@ public class SearchManager
/**
* Intent extra data key: This key will be used for the extra populated by the
* {@link #SUGGEST_COLUMN_INTENT_EXTRA_DATA} column.
*
* {@hide}
*/
public final static String EXTRA_DATA_KEY = "intent_extra_data_key";
@@ -1269,16 +1267,12 @@ public class SearchManager
* result indicates the shortcut refers to a no longer valid sugggestion.
*
* @see #SUGGEST_COLUMN_SHORTCUT_ID
*
* @hide pending API council approval
*/
public final static String SUGGEST_URI_PATH_SHORTCUT = "search_suggest_shortcut";
/**
* MIME type for shortcut validation. You'll use this in your suggestions content provider
* in the getType() function.
*
* @hide pending API council approval
*/
public final static String SHORTCUT_MIME_TYPE =
"vnd.android.cursor.item/vnd.android.search.suggest";
@@ -1389,9 +1383,7 @@ public class SearchManager
* this element exists at the given row, this is the data that will be used when
* forming the suggestion's intent. If not provided, the Intent's extra data field will be null.
* This column allows suggestions to provide additional arbitrary data which will be included as
* an extra under the key EXTRA_DATA_KEY.
*
* @hide Pending API council approval.
* an extra under the key {@link #EXTRA_DATA_KEY}.
*/
public final static String SUGGEST_COLUMN_INTENT_EXTRA_DATA = "suggest_intent_extra_data";
/**
@@ -1425,8 +1417,6 @@ public class SearchManager
* {@link #SUGGEST_NEVER_MAKE_SHORTCUT}, the result will not be stored as a shortcut.
* Otherwise, the shortcut id will be used to check back for validation via
* {@link #SUGGEST_URI_PATH_SHORTCUT}.
*
* @hide Pending API council approval.
*/
public final static String SUGGEST_COLUMN_SHORTCUT_ID = "suggest_shortcut_id";
@@ -1443,8 +1433,6 @@ public class SearchManager
* Column name for suggestions cursor. <i>Optional.</i> This column is used to specify
* that a spinner should be shown in lieu of an icon2 while the shortcut of this suggestion
* is being refreshed.
*
* @hide Pending API council approval.
*/
public final static String SUGGEST_COLUMN_SPINNER_WHILE_REFRESHING =
"suggest_spinner_while_refreshing";
@@ -1452,8 +1440,6 @@ public class SearchManager
/**
* Column value for suggestion column {@link #SUGGEST_COLUMN_SHORTCUT_ID} when a suggestion
* should not be stored as a shortcut in global search.
*
* @hide Pending API council approval.
*/
public final static String SUGGEST_NEVER_MAKE_SHORTCUT = "_-1";
@@ -1500,8 +1486,6 @@ public class SearchManager
* 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";