Merge "Add a new intent category used for activities running in carmode." into froyo (e13beb09) · Commits · e / os / android_frameworks_base

api/current.xml

+11 −0

Original line number	Diff line number	Diff line
		@@ -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"

+8 −1

Original line number	Diff line number	Diff line
		@@ -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.