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

Merge commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4' into froyo-plus-aosp

* commit 'e13beb09dadfba4806e6784bc7cde1466eb54ca4':
  Add a new intent category used for activities running in carmode.

api/current.xml

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

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.