diff options
| author | Jim Miller <> | 2009-03-25 18:18:34 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-25 18:18:34 -0700 |
| commit | 303736d17de11dbc0a633cbfc130e9dadd50f6e2 (patch) | |
| tree | 52807ba2f38e00b8630d7fc0f55b3092a0b4ca93 | |
| parent | 8f2d94fd77836dac14319735e40f46b18b04216d (diff) | |
| download | frameworks_base-303736d17de11dbc0a633cbfc130e9dadd50f6e2.zip frameworks_base-303736d17de11dbc0a633cbfc130e9dadd50f6e2.tar.gz frameworks_base-303736d17de11dbc0a633cbfc130e9dadd50f6e2.tar.bz2 | |
Automated import from //branches/donutburger/...@142826,142826
| -rw-r--r-- | api/current.xml | 11 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 9 |
2 files changed, 20 insertions, 0 deletions
diff --git a/api/current.xml b/api/current.xml index d366f29..5dd99ed 100644 --- a/api/current.xml +++ b/api/current.xml @@ -28632,6 +28632,17 @@ visibility="public" > </field> +<field name="ACTION_SYSTEM_TUTORIAL" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.action.SYSTEM_TUTORIAL"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="ACTION_TIMEZONE_CHANGED" type="java.lang.String" transient="false" diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index c514df7..429c060 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -967,6 +967,15 @@ public class Intent implements Parcelable { @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_SEARCH = "android.intent.action.SEARCH"; /** + * Activity Action: Start the platform-defined tutorial + * <p>Input: {@link android.app.SearchManager#QUERY getStringExtra(SearchManager.QUERY)} + * is the text to search for. If empty, simply + * enter your search results Activity with the search UI activated. + * <p>Output: nothing. + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_SYSTEM_TUTORIAL = "android.intent.action.SYSTEM_TUTORIAL"; + /** * Activity Action: Perform a web search. * <p> * Input: {@link android.app.SearchManager#QUERY |