drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e13beb09: Merge "Add a new intent category used for activities running in carmode." into froyo

Browse Source 
Merge commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4' into froyo-plus-aosp

* commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4':
  Add a new intent category used for activities running in carmode.
This commit is contained in:
Dianne Hackborn
2010-04-02 13:39:11 -07:00
committed by Android Git Automerger
parent 90bd943364 e13beb09da
commit 9bdc45084f
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/current.xml
View File

@ -38684,6 +38684,17 @@
visibility="public"
>
</field>
<field name="CATEGORY_CAR_MODE"
type="java.lang.String"
transient="false"
volatile="false"
value="&quot;android.intent.category.CAR_MODE&quot;"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="CATEGORY_DEFAULT"
type="java.lang.String"
transient="false"

7
core/java/android/content/Intent.java
View File

@ -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.