diff options
| author | Ed Heyl <> | 2009-03-27 16:52:45 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-27 16:52:45 -0700 |
| commit | a2debb356d857b2ee1ca26f95ed0136398393acd (patch) | |
| tree | 84408b577c6e6274781c38eb54da15761b213690 | |
| parent | d9b7d24667f578ec7aaf187690d5b12d6f363221 (diff) | |
| download | frameworks_base-a2debb356d857b2ee1ca26f95ed0136398393acd.zip frameworks_base-a2debb356d857b2ee1ca26f95ed0136398393acd.tar.gz frameworks_base-a2debb356d857b2ee1ca26f95ed0136398393acd.tar.bz2 | |
AI 143278: Merge 142826: Add tutorial to platform. The tutorial can be launched with the new Intent ACTION_SYSTEM_TUTORIAL and
is available through Settings->About->System Tutorial
Automated import of CL 143278
| -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 19b3bba..a7ac744 100644 --- a/api/current.xml +++ b/api/current.xml @@ -29087,6 +29087,17 @@ deprecated="not deprecated" visibility="public" > +<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> <parameter name="name" type="java.lang.String"> </parameter> </method> 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 |