Merge "resolved conflicts for merge of 6c45157c to master" (41c2d2ce) · Commits · e / os / android_frameworks_base

api/current.txt

+16 −14

Original line number	Diff line number	Diff line
		@@ -399,10 +399,10 @@ package android {
		field public static final int content = 16843355; // 0x101025b
		field public static final int contentAuthority = 16843408; // 0x1010290
		field public static final int contentDescription = 16843379; // 0x1010273
		field public static final int controlX1 = 16843770; // 0x10103fa
		field public static final int controlX2 = 16843772; // 0x10103fc
		field public static final int controlY1 = 16843771; // 0x10103fb
		field public static final int controlY2 = 16843773; // 0x10103fd
		field public static final int controlX1 = 16843771; // 0x10103fb
		field public static final int controlX2 = 16843773; // 0x10103fd
		field public static final int controlY1 = 16843772; // 0x10103fc
		field public static final int controlY2 = 16843774; // 0x10103fe
		field public static final int cropToPadding = 16843043; // 0x1010123
		field public static final int cursorVisible = 16843090; // 0x1010152
		field public static final int customNavigationLayout = 16843474; // 0x10102d2
		@@ -505,7 +505,7 @@ package android {
		field public static final int fastScrollOverlayPosition = 16843578; // 0x101033a
		field public static final int fastScrollPreviewBackgroundLeft = 16843575; // 0x1010337
		field public static final int fastScrollPreviewBackgroundRight = 16843576; // 0x1010338
		field public static final int fastScrollStyle = 16843765; // 0x10103f5
		field public static final int fastScrollStyle = 16843766; // 0x10103f6
		field public static final int fastScrollTextColor = 16843609; // 0x1010359
		field public static final int fastScrollThumbDrawable = 16843574; // 0x1010336
		field public static final int fastScrollTrackDrawable = 16843577; // 0x1010339
		@@ -531,7 +531,7 @@ package android {
		field public static final int format12Hour = 16843722; // 0x10103ca
		field public static final int format24Hour = 16843723; // 0x10103cb
		field public static final int fragment = 16843491; // 0x10102e3
		field public static final int fragmentBreadCrumbsStyle = 16843764; // 0x10103f4
		field public static final int fragmentBreadCrumbsStyle = 16843765; // 0x10103f5
		field public static final int fragmentCloseEnterAnimation = 16843495; // 0x10102e7
		field public static final int fragmentCloseExitAnimation = 16843496; // 0x10102e8
		field public static final int fragmentFadeEnterAnimation = 16843497; // 0x10102e9
		@@ -630,6 +630,7 @@ package android {
		field public static final int isAsciiCapable = 16843753; // 0x10103e9
		field public static final int isAuxiliary = 16843647; // 0x101037f
		field public static final int isDefault = 16843297; // 0x1010221
		field public static final int isGame = 16843764; // 0x10103f4
		field public static final int isIndicator = 16843079; // 0x1010147
		field public static final int isModifier = 16843334; // 0x1010246
		field public static final int isRepeatable = 16843336; // 0x1010248
		@@ -825,7 +826,7 @@ package android {
		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
		field public static final int pinned = 16843777; // 0x1010401
		field public static final int pinned = 16843778; // 0x1010402
		field public static final int pivotX = 16843189; // 0x10101b5
		field public static final int pivotY = 16843190; // 0x10101b6
		field public static final int popupAnimationStyle = 16843465; // 0x10102c9
		@@ -889,7 +890,7 @@ package android {
		field public static final int required = 16843406; // 0x101028e
		field public static final int requiredAccountType = 16843734; // 0x10103d6
		field public static final int requiredForAllUsers = 16843728; // 0x10103d0
		field public static final int requiredForProfile = 16843776; // 0x1010400
		field public static final int requiredForProfile = 16843777; // 0x1010401
		field public static final int requiresFadingEdge = 16843685; // 0x10103a5
		field public static final int requiresSmallestWidthDp = 16843620; // 0x1010364
		field public static final int resizeMode = 16843619; // 0x1010363
		@@ -960,7 +961,7 @@ package android {
		field public static final int shadowRadius = 16843108; // 0x1010164
		field public static final int shape = 16843162; // 0x101019a
		field public static final int shareInterpolator = 16843195; // 0x10101bb
		field public static final int sharedElementName = 16843774; // 0x10103fe
		field public static final int sharedElementName = 16843775; // 0x10103ff
		field public static final int sharedUserId = 16842763; // 0x101000b
		field public static final int sharedUserLabel = 16843361; // 0x1010261
		field public static final int shouldDisableView = 16843246; // 0x10101ee
		@@ -1137,7 +1138,7 @@ package android {
		field public static final int tileMode = 16843265; // 0x1010201
		field public static final int timeZone = 16843724; // 0x10103cc
		field public static final int tint = 16843041; // 0x1010121
		field public static final int tintMode = 16843769; // 0x10103f9
		field public static final int tintMode = 16843770; // 0x10103fa
		field public static final int title = 16843233; // 0x10101e1
		field public static final int titleCondensed = 16843234; // 0x10101e2
		field public static final int titleTextStyle = 16843512; // 0x10102f8
		@@ -1159,11 +1160,11 @@ package android {
		field public static final int transformPivotX = 16843552; // 0x1010320
		field public static final int transformPivotY = 16843553; // 0x1010321
		field public static final int transition = 16843743; // 0x10103df
		field public static final int transitionGroup = 16843775; // 0x10103ff
		field public static final int transitionGroup = 16843776; // 0x1010400
		field public static final int transitionOrdering = 16843744; // 0x10103e0
		field public static final int translationX = 16843554; // 0x1010322
		field public static final int translationY = 16843555; // 0x1010323
		field public static final int translationZ = 16843768; // 0x10103f8
		field public static final int translationZ = 16843769; // 0x10103f9
		field public static final int type = 16843169; // 0x10101a1
		field public static final int typeface = 16842902; // 0x1010096
		field public static final int uiOptions = 16843672; // 0x1010398
		@@ -1220,8 +1221,8 @@ package android {
		field public static final int windowBackground = 16842836; // 0x1010054
		field public static final int windowCloseOnTouchOutside = 16843611; // 0x101035b
		field public static final int windowContentOverlay = 16842841; // 0x1010059
		field public static final int windowContentTransitionManager = 16843767; // 0x10103f7
		field public static final int windowContentTransitions = 16843766; // 0x10103f6
		field public static final int windowContentTransitionManager = 16843768; // 0x10103f8
		field public static final int windowContentTransitions = 16843767; // 0x10103f7
		field public static final int windowDisablePreview = 16843298; // 0x1010222
		field public static final int windowEnableSplitTouch = 16843543; // 0x1010317
		field public static final int windowEnterAnimation = 16842932; // 0x10100b4
		@@ -7400,6 +7401,7 @@ package android.content.pm {
		field public static final int FLAG_HAS_CODE = 4; // 0x4
		field public static final int FLAG_INSTALLED = 8388608; // 0x800000
		field public static final int FLAG_IS_DATA_ONLY = 16777216; // 0x1000000
		field public static final int FLAG_IS_GAME = 33554432; // 0x2000000
		field public static final int FLAG_KILL_AFTER_RESTORE = 65536; // 0x10000
		field public static final int FLAG_LARGE_HEAP = 1048576; // 0x100000
		field public static final int FLAG_PERSISTENT = 8; // 0x8

core/java/android/content/pm/ApplicationInfo.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -314,6 +314,12 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		*/
		public static final int FLAG_IS_DATA_ONLY = 1<<24;

		/**
		* Value for {@link #flags}: true if the application was declared to be a game, or
		* false if it is a non-game application.
		*/
		public static final int FLAG_IS_GAME = 1<<25;

		/**
		* Value for {@link #flags}: set to {@code true} if the application
		* is permitted to hold privileged permissions.
		@@ -363,7 +369,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
		* {@link #FLAG_SUPPORTS_LARGE_SCREENS}, {@link #FLAG_SUPPORTS_XLARGE_SCREENS},
		* {@link #FLAG_RESIZEABLE_FOR_SCREENS},
		* {@link #FLAG_SUPPORTS_SCREEN_DENSITIES}, {@link #FLAG_VM_SAFE_MODE},
		* {@link #FLAG_INSTALLED}.
		* {@link #FLAG_INSTALLED}, {@link #FLAG_IS_GAME}.
		*/
		public int flags = 0;

core/java/android/content/pm/PackageParser.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -2092,6 +2092,11 @@ public class PackageParser {
		ai.enabled = sa.getBoolean(
		com.android.internal.R.styleable.AndroidManifestApplication_enabled, true);

		if (sa.getBoolean(
		com.android.internal.R.styleable.AndroidManifestApplication_isGame, false)) {
		ai.flags \|= ApplicationInfo.FLAG_IS_GAME;
		}

		if (false) {
		if (sa.getBoolean(
		com.android.internal.R.styleable.AndroidManifestApplication_cantSaveState,

core/res/res/values/attrs_manifest.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -323,6 +323,12 @@
		content providers. -->
		<attr name="exported" format="boolean" />

		<!-- A boolean flag used to indicate if an application is a Game or not.
		<p>This information can be used by the system to group together
		applications that are classified as games, and display them separately
		from the other applications. -->
		<attr name="isGame" format="boolean" />

		<!-- If set to true, a single instance of this component will run for
		all users. That instance will run as user 0, the default/primary
		user. When the app running is in processes for other users and interacts
		@@ -979,6 +985,7 @@
		any accounts. The type should correspond to the account authenticator type, such as
		"com.google". -->
		<attr name="requiredAccountType" format="string"/>
		<attr name="isGame" />
		</declare-styleable>

		<!-- The <code>permission</code> tag declares a security permission that can be

core/res/res/values/public.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -2094,6 +2094,7 @@

		<public type="attr" name="banner" id="0x10103f2" />
		<public type="attr" name="windowSwipeToDismiss" id="0x10103f3" />
		<public type="attr" name="isGame" />

		<!-- ===============================================================
		Resources added in version 21 of the platform