Merge "Fix application launch shortcuts." into ics-mr1 (be6ab576) · Commits · e / os / android_frameworks_base

api/current.txt

+14 −1

Original line number	Diff line number	Diff line
		@@ -5502,7 +5502,16 @@ package android.content {
		field public static final java.lang.String ACTION_WALLPAPER_CHANGED = "android.intent.action.WALLPAPER_CHANGED";
		field public static final java.lang.String ACTION_WEB_SEARCH = "android.intent.action.WEB_SEARCH";
		field public static final java.lang.String CATEGORY_ALTERNATIVE = "android.intent.category.ALTERNATIVE";
		field public static final java.lang.String CATEGORY_APP_BROWSER = "android.intent.category.APP_BROWSER";
		field public static final java.lang.String CATEGORY_APP_CALCULATOR = "android.intent.category.APP_CALCULATOR";
		field public static final java.lang.String CATEGORY_APP_CALENDAR = "android.intent.category.APP_CALENDAR";
		field public static final java.lang.String CATEGORY_APP_CONTACTS = "android.intent.category.APP_CONTACTS";
		field public static final java.lang.String CATEGORY_APP_EMAIL = "android.intent.category.APP_EMAIL";
		field public static final java.lang.String CATEGORY_APP_GALLERY = "android.intent.category.APP_GALLERY";
		field public static final java.lang.String CATEGORY_APP_MAPS = "android.intent.category.APP_MAPS";
		field public static final java.lang.String CATEGORY_APP_MARKET = "android.intent.category.APP_MARKET";
		field public static final java.lang.String CATEGORY_APP_MESSAGING = "android.intent.category.APP_MESSAGING";
		field public static final java.lang.String CATEGORY_APP_MUSIC = "android.intent.category.APP_MUSIC";
		field public static final java.lang.String CATEGORY_BROWSABLE = "android.intent.category.BROWSABLE";
		field public static final java.lang.String CATEGORY_CAR_DOCK = "android.intent.category.CAR_DOCK";
		field public static final java.lang.String CATEGORY_CAR_MODE = "android.intent.category.CAR_MODE";
		@@ -17056,7 +17065,7 @@ package android.provider {
		field public static final java.lang.String EXTRA_VIDEO_QUALITY = "android.intent.extra.videoQuality";
		field public static final java.lang.String INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH = "android.media.action.MEDIA_PLAY_FROM_SEARCH";
		field public static final java.lang.String INTENT_ACTION_MEDIA_SEARCH = "android.intent.action.MEDIA_SEARCH";
		field public static final java.lang.String INTENT_ACTION_MUSIC_PLAYER = "android.intent.action.MUSIC_PLAYER";
		field public static final deprecated java.lang.String INTENT_ACTION_MUSIC_PLAYER = "android.intent.action.MUSIC_PLAYER";
		field public static final java.lang.String INTENT_ACTION_STILL_IMAGE_CAMERA = "android.media.action.STILL_IMAGE_CAMERA";
		field public static final java.lang.String INTENT_ACTION_VIDEO_CAMERA = "android.media.action.VIDEO_CAMERA";
		field public static final java.lang.String MEDIA_IGNORE_FILENAME = ".nomedia";
		@@ -22215,6 +22224,8 @@ package android.view {
		field public static final int KEYCODE_BUTTON_Y = 100; // 0x64
		field public static final int KEYCODE_BUTTON_Z = 101; // 0x65
		field public static final int KEYCODE_C = 31; // 0x1f
		field public static final int KEYCODE_CALCULATOR = 210; // 0xd2
		field public static final int KEYCODE_CALENDAR = 208; // 0xd0
		field public static final int KEYCODE_CALL = 5; // 0x5
		field public static final int KEYCODE_CAMERA = 27; // 0x1b
		field public static final int KEYCODE_CAPS_LOCK = 115; // 0x73
		@@ -22223,6 +22234,7 @@ package android.view {
		field public static final int KEYCODE_CHANNEL_UP = 166; // 0xa6
		field public static final int KEYCODE_CLEAR = 28; // 0x1c
		field public static final int KEYCODE_COMMA = 55; // 0x37
		field public static final int KEYCODE_CONTACTS = 207; // 0xcf
		field public static final int KEYCODE_CTRL_LEFT = 113; // 0x71
		field public static final int KEYCODE_CTRL_RIGHT = 114; // 0x72
		field public static final int KEYCODE_D = 32; // 0x20
		@@ -22290,6 +22302,7 @@ package android.view {
		field public static final int KEYCODE_MINUS = 69; // 0x45
		field public static final int KEYCODE_MOVE_END = 123; // 0x7b
		field public static final int KEYCODE_MOVE_HOME = 122; // 0x7a
		field public static final int KEYCODE_MUSIC = 209; // 0xd1
		field public static final int KEYCODE_MUTE = 91; // 0x5b
		field public static final int KEYCODE_N = 42; // 0x2a
		field public static final int KEYCODE_NOTIFICATION = 83; // 0x53

core/java/android/content/Intent.java

+68 −0

Original line number	Diff line number	Diff line
		@@ -2308,6 +2308,74 @@ public class Intent implements Parcelable, Cloneable {
		@SdkConstant(SdkConstantType.INTENT_CATEGORY)
		public static final String CATEGORY_CAR_MODE = "android.intent.category.CAR_MODE";

		// ---------------------------------------------------------------------
		// ---------------------------------------------------------------------
		// Application launch intent categories (see addCategory()).

		/**
		* Used with {@link #ACTION_MAIN} to launch the browser application.
		* The activity should be able to browse the Internet.
		*/
		@SdkConstant(SdkConstantType.INTENT_CATEGORY)
		public static final String CATEGORY_APP_BROWSER = "android.intent.category.APP_BROWSER";

		/**
		* Used with {@link #ACTION_MAIN} to launch the calculator application.
		* The activity should be able to perform standard arithmetic operations.
		*/
		@SdkConstant(SdkConstantType.INTENT_CATEGORY)
		public static final String CATEGORY_APP_CALCULATOR = "android.intent.category.APP_CALCULATOR";

		/**
		* Used with {@link #ACTION_MAIN} to launch the calendar application.
		* The activity should be able to view and manipulate calendar entries.
		*/
		@SdkConstant(SdkConstantType.INTENT_CATEGORY)
		public static final String CATEGORY_APP_CALENDAR = "android.intent.category.APP_CALENDAR";

		/**
		* Used with {@link #ACTION_MAIN} to launch the contacts application.
		* The activity should be able to view and manipulate address book entries.
		*/
		@SdkConstant(SdkConstantType.INTENT_CATEGORY)
		public static final String CATEGORY_APP_CONTACTS = "android.intent.category.APP_CONTACTS";

		/**
		* Used with {@link #ACTION_MAIN} to launch the email application.
		* The activity should be able to send and receive email.
		*/
		@SdkConstant(SdkConstantType.INTENT_CATEGORY)
		public static final String CATEGORY_APP_EMAIL = "android.intent.category.APP_EMAIL";

		/**
		* Used with {@link #ACTION_MAIN} to launch the gallery application.
		* The activity should be able to view and manipulate image and video files
		* stored on the device.
		*/
		@SdkConstant(SdkConstantType.INTENT_CATEGORY)
		public static final String CATEGORY_APP_GALLERY = "android.intent.category.APP_GALLERY";

		/**
		* Used with {@link #ACTION_MAIN} to launch the maps application.
		* The activity should be able to show the user's current location and surroundings.
		*/
		@SdkConstant(SdkConstantType.INTENT_CATEGORY)
		public static final String CATEGORY_APP_MAPS = "android.intent.category.APP_MAPS";

		/**
		* Used with {@link #ACTION_MAIN} to launch the messaging application.
		* The activity should be able to send and receive text messages.
		*/
		@SdkConstant(SdkConstantType.INTENT_CATEGORY)
		public static final String CATEGORY_APP_MESSAGING = "android.intent.category.APP_MESSAGING";

		/**
		* Used with {@link #ACTION_MAIN} to launch the music application.
		* The activity should be able to play, browse, or manipulate music files stored on the device.
		*/
		@SdkConstant(SdkConstantType.INTENT_CATEGORY)
		public static final String CATEGORY_APP_MUSIC = "android.intent.category.APP_MUSIC";

		// ---------------------------------------------------------------------
		// ---------------------------------------------------------------------
		// Standard extra data keys.

core/java/android/provider/MediaStore.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -40,8 +40,6 @@ import java.io.FileNotFoundException;
		import java.io.IOException;
		import java.io.InputStream;
		import java.io.OutputStream;
		import java.io.UnsupportedEncodingException;
		import java.text.Collator;

		/**
		* The Media provider contains meta data for all available media on both internal
		@@ -66,7 +64,10 @@ public final class MediaStore {
		/**
		* Activity Action: Launch a music player.
		* The activity should be able to play, browse, or manipulate music files stored on the device.
		*
		* @deprecated Use {@link android.content.Intent#CATEGORY_APP_MUSIC} instead.
		*/
		@Deprecated
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String INTENT_ACTION_MUSIC_PLAYER = "android.intent.action.MUSIC_PLAYER";

core/java/android/view/KeyEvent.java

+20 −2

Original line number	Diff line number	Diff line
		@@ -579,8 +579,20 @@ public class KeyEvent extends InputEvent implements Parcelable {
		/** Key code constant: 3D Mode key.
		* Toggles the display between 2D and 3D mode. */
		public static final int KEYCODE_3D_MODE = 206;

		private static final int LAST_KEYCODE = KEYCODE_BUTTON_16;
		/** Key code constant: Contacts special function key.
		* Used to launch an address book application. */
		public static final int KEYCODE_CONTACTS = 207;
		/** Key code constant: Calendar special function key.
		* Used to launch a calendar application. */
		public static final int KEYCODE_CALENDAR = 208;
		/** Key code constant: Music special function key.
		* Used to launch a music player application. */
		public static final int KEYCODE_MUSIC = 209;
		/** Key code constant: Calculator special function key.
		* Used to launch a calculator application. */
		public static final int KEYCODE_CALCULATOR = 210;

		private static final int LAST_KEYCODE = KEYCODE_CALCULATOR;

		// NOTE: If you add a new keycode here you must also add it to:
		// isSystem()
		@@ -589,6 +601,8 @@ public class KeyEvent extends InputEvent implements Parcelable {
		// external/webkit/WebKit/android/plugins/ANPKeyCodes.h
		// frameworks/base/core/res/res/values/attrs.xml
		// emulator?
		// LAST_KEYCODE
		// KEYCODE_SYMBOLIC_NAMES
		//
		// Also Android currently does not reserve code ranges for vendor-
		// specific key codes. If you have new key codes to have, you
		@@ -807,6 +821,10 @@ public class KeyEvent extends InputEvent implements Parcelable {
		names.append(KEYCODE_LANGUAGE_SWITCH, "KEYCODE_LANGUAGE_SWITCH");
		names.append(KEYCODE_MANNER_MODE, "KEYCODE_MANNER_MODE");
		names.append(KEYCODE_3D_MODE, "KEYCODE_3D_MODE");
		names.append(KEYCODE_CONTACTS, "KEYCODE_CONTACTS");
		names.append(KEYCODE_CALENDAR, "KEYCODE_CALENDAR");
		names.append(KEYCODE_MUSIC, "KEYCODE_MUSIC");
		names.append(KEYCODE_CALCULATOR, "KEYCODE_CALCULATOR");
		};

		// Symbolic names of all metakeys in bit order from least significant to most significant.

core/res/res/values/attrs.xml

+4 −0

Original line number	Diff line number	Diff line
		@@ -1493,6 +1493,10 @@
		<enum name="KEYCODE_LANGUAGE_SWITCH" value="204" />
		<enum name="KEYCODE_MANNER_MODE" value="205" />
		<enum name="KEYCODE_3D_MODE" value="206" />
		<enum name="KEYCODE_CONTACTS" value="207" />
		<enum name="KEYCODE_CALENDAR" value="208" />
		<enum name="KEYCODE_MUSIC" value="209" />
		<enum name="KEYCODE_CALCULATOR" value="210" />
		</attr>

		<!-- ***************************************************************** -->