am fa61f0b2: JellyBean is now 4.1. (ef9876a6) · Commits · e / os / android_frameworks_base

api/16.txt

+1605 −262

File changed.

Preview size limit exceeded, changes collapsed.

api/current.txt

+5 −5

Original line number	Diff line number	Diff line
		@@ -588,12 +588,12 @@ package android {
		field public static final int isRepeatable = 16843336; // 0x1010248
		field public static final int isScrollContainer = 16843342; // 0x101024e
		field public static final int isSticky = 16843335; // 0x1010247
		field public static final int isolatedProcess = 16843687; // 0x10103a7
		field public static final int isolatedProcess = 16843689; // 0x10103a9
		field public static final int itemBackground = 16843056; // 0x1010130
		field public static final int itemIconDisabledAlpha = 16843057; // 0x1010131
		field public static final int itemPadding = 16843565; // 0x101032d
		field public static final int itemTextAppearance = 16843052; // 0x101012c
		field public static final int kcm = 16843688; // 0x10103a8
		field public static final int kcm = 16843691; // 0x10103ab
		field public static final int keepScreenOn = 16843286; // 0x1010216
		field public static final int key = 16843240; // 0x10101e8
		field public static final int keyBackground = 16843315; // 0x1010233
		@@ -746,14 +746,14 @@ package android {
		field public static final int panelColorForeground = 16842848; // 0x1010060
		field public static final int panelFullBackground = 16842847; // 0x101005f
		field public static final int panelTextAppearance = 16842850; // 0x1010062
		field public static final int parentActivityName = 16843689; // 0x10103a9
		field public static final int parentActivityName = 16843687; // 0x10103a7
		field public static final deprecated int password = 16843100; // 0x101015c
		field public static final int path = 16842794; // 0x101002a
		field public static final int pathPattern = 16842796; // 0x101002c
		field public static final int pathPrefix = 16842795; // 0x101002b
		field public static final int permission = 16842758; // 0x1010006
		field public static final int permissionGroup = 16842762; // 0x101000a
		field public static final int permissionGroupFlags = 16843691; // 0x10103ab
		field public static final int permissionGroupFlags = 16843688; // 0x10103a8
		field public static final int persistent = 16842765; // 0x101000d
		field public static final int persistentDrawingCache = 16842990; // 0x10100ee
		field public static final deprecated int phoneNumber = 16843111; // 0x1010167
		@@ -15218,7 +15218,7 @@ package android.os {
		field public static final int HONEYCOMB_MR2 = 13; // 0xd
		field public static final int ICE_CREAM_SANDWICH = 14; // 0xe
		field public static final int ICE_CREAM_SANDWICH_MR1 = 15; // 0xf
		field public static final int JELLY_BEAN = 10000; // 0x2710
		field public static final int JELLY_BEAN = 16; // 0x10
		}

		public final class Bundle implements java.lang.Cloneable android.os.Parcelable {

core/java/android/os/Build.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -370,7 +370,7 @@ public class Build {
		public static final int ICE_CREAM_SANDWICH_MR1 = 15;

		/**
		* Next up on Android!
		* Android 4.1.
		*
		* <p>Applications targeting this or a later release will get these
		* new changes in behavior:</p>
		@@ -381,7 +381,7 @@ public class Build {
		* exist in the application's manifest.
		* </ul>
		*/
		public static final int JELLY_BEAN = CUR_DEVELOPMENT;
		public static final int JELLY_BEAN = 16;
		}

		/** The type of build, like "user" or "eng". */

core/res/res/values/public.xml

+5 −9

Original line number	Diff line number	Diff line
		@@ -3599,14 +3599,10 @@
		<!-- ===============================================================
		Resources added in version 16 of the platform (Jelly Bean)
		=============================================================== -->
		<public type="attr" name="isolatedProcess" id="0x010103a7" />

		<public type="attr" name="kcm"/>

		<public type="attr" name="parentActivityName" />

		<public type="attr" name="importantForAccessibility"/>

		<public type="attr" name="permissionGroupFlags"/>
		<public type="attr" name="parentActivityName" id="0x010103a7" />
		<public type="attr" name="permissionGroupFlags" id="0x010103a8" />
		<public type="attr" name="isolatedProcess" id="0x010103a9" />
		<public type="attr" name="importantForAccessibility" id="0x010103aa" />
		<public type="attr" name="kcm" id="0x010103ab" />

		</resources>