diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-04-02 13:42:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-02 13:42:09 -0700 |
| commit | 4d075b029f13e9c38e70d87ca4b246902d3f72c4 (patch) | |
| tree | 669b725fc8384b203ec6378b2b5ca37a5ff2a384 | |
| parent | db83a6f56c54055b1e62da9fe97eb4def0669b3f (diff) | |
| parent | 9bdc45084f963869d4e9dd68de2280d3de7dda1d (diff) | |
| download | frameworks_base-4d075b029f13e9c38e70d87ca4b246902d3f72c4.zip frameworks_base-4d075b029f13e9c38e70d87ca4b246902d3f72c4.tar.gz frameworks_base-4d075b029f13e9c38e70d87ca4b246902d3f72c4.tar.bz2 | |
am 9bdc4508: am e13beb09: Merge "Add a new intent category used for activities running in carmode." into froyo
Merge commit '9bdc45084f963869d4e9dd68de2280d3de7dda1d' into kraken
* commit '9bdc45084f963869d4e9dd68de2280d3de7dda1d':
Add a new intent category used for activities running in carmode.
| -rw-r--r-- | api/current.xml | 11 | ||||
| -rw-r--r-- | core/java/android/content/Intent.java | 9 |
2 files changed, 19 insertions, 1 deletions
diff --git a/api/current.xml b/api/current.xml index 53f5178..a4aeb85 100644 --- a/api/current.xml +++ b/api/current.xml @@ -38684,6 +38684,17 @@ visibility="public" > </field> +<field name="CATEGORY_CAR_MODE" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.intent.category.CAR_MODE"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="CATEGORY_DEFAULT" type="java.lang.String" transient="false" diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index fd5591d..13494f8 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -533,6 +533,7 @@ import java.util.Set; * <li> {@link #CATEGORY_TEST} * <li> {@link #CATEGORY_CAR_DOCK} * <li> {@link #CATEGORY_DESK_DOCK} + * <li> {@link #CATEGORY_CAR_MODE} * </ul> * * <h3>Standard Extra Data</h3> @@ -2023,6 +2024,12 @@ public class Intent implements Parcelable, Cloneable { @SdkConstant(SdkConstantType.INTENT_CATEGORY) public static final String CATEGORY_DESK_DOCK = "android.intent.category.DESK_DOCK"; + /** + * Used to indicate that the activity can be used in a car environment. + */ + @SdkConstant(SdkConstantType.INTENT_CATEGORY) + public static final String CATEGORY_CAR_MODE = "android.intent.category.CAR_MODE"; + // --------------------------------------------------------------------- // --------------------------------------------------------------------- // Standard extra data keys. @@ -2118,7 +2125,7 @@ public class Intent implements Parcelable, Cloneable { * number to call in a {@link android.content.Intent#ACTION_CALL}. */ public static final String EXTRA_PHONE_NUMBER = "android.intent.extra.PHONE_NUMBER"; - + /** * Used as an int extra field in {@link android.content.Intent#ACTION_UID_REMOVED} * intents to supply the uid the package had been assigned. Also an optional |