resolved conflicts for merge of 4882ddfa to master (92703e62) · Commits · e / os / android_frameworks_base

api/current.txt

+27 −15

Original line number	Diff line number	Diff line
		@@ -314,6 +314,7 @@ package android {
		field public static final int backgroundSplit = 16843659; // 0x101038b
		field public static final int backgroundStacked = 16843658; // 0x101038a
		field public static final int backupAgent = 16843391; // 0x101027f
		field public static final int banner = 16843762; // 0x10103f2
		field public static final int baseline = 16843548; // 0x101031c
		field public static final int baselineAlignBottom = 16843042; // 0x1010122
		field public static final int baselineAligned = 16843046; // 0x1010126
		@@ -345,7 +346,7 @@ package android {
		field public static final int canRetrieveWindowContent = 16843653; // 0x1010385
		field public static final int candidatesTextStyleSpans = 16843312; // 0x1010230
		field public static final deprecated int capitalize = 16843113; // 0x1010169
		field public static final int castsShadow = 16843774; // 0x10103fe
		field public static final int castsShadow = 16843775; // 0x10103ff
		field public static final int category = 16843752; // 0x10103e8
		field public static final int centerBright = 16842956; // 0x10100cc
		field public static final int centerColor = 16843275; // 0x101020b
		@@ -399,10 +400,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 = 16843768; // 0x10103f8
		field public static final int controlX2 = 16843770; // 0x10103fa
		field public static final int controlY1 = 16843769; // 0x10103f9
		field public static final int controlY2 = 16843771; // 0x10103fb
		field public static final int controlX1 = 16843769; // 0x10103f9
		field public static final int controlX2 = 16843771; // 0x10103fb
		field public static final int controlY1 = 16843770; // 0x10103fa
		field public static final int controlY2 = 16843772; // 0x10103fc
		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 +506,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 = 16843763; // 0x10103f3
		field public static final int fastScrollStyle = 16843764; // 0x10103f4
		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 +532,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 = 16843762; // 0x10103f2
		field public static final int fragmentBreadCrumbsStyle = 16843763; // 0x10103f3
		field public static final int fragmentCloseEnterAnimation = 16843495; // 0x10102e7
		field public static final int fragmentCloseExitAnimation = 16843496; // 0x10102e8
		field public static final int fragmentFadeEnterAnimation = 16843497; // 0x10102e9
		@@ -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 = 16843776; // 0x1010400
		field public static final int pinned = 16843777; // 0x1010401
		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 = 16843775; // 0x10103ff
		field public static final int requiredForProfile = 16843776; // 0x1010400
		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 = 16843772; // 0x10103fc
		field public static final int sharedElementName = 16843773; // 0x10103fd
		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 = 16843767; // 0x10103f7
		field public static final int tintMode = 16843768; // 0x10103f8
		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 = 16843773; // 0x10103fd
		field public static final int transitionGroup = 16843774; // 0x10103fe
		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 = 16843766; // 0x10103f6
		field public static final int translationZ = 16843767; // 0x10103f7
		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 = 16843765; // 0x10103f5
		field public static final int windowContentTransitions = 16843764; // 0x10103f4
		field public static final int windowContentTransitionManager = 16843766; // 0x10103f6
		field public static final int windowContentTransitions = 16843765; // 0x10103f5
		field public static final int windowDisablePreview = 16843298; // 0x1010222
		field public static final int windowEnableSplitTouch = 16843543; // 0x1010317
		field public static final int windowEnterAnimation = 16842932; // 0x10100b4
		@@ -7417,6 +7418,7 @@ package android.content.pm {
		ctor public ComponentInfo();
		ctor public ComponentInfo(android.content.pm.ComponentInfo);
		ctor protected ComponentInfo(android.os.Parcel);
		method public final int getBannerResource();
		method public final int getIconResource();
		method public final int getLogoResource();
		method public boolean isEnabled();
		@@ -7520,11 +7522,13 @@ package android.content.pm {
		ctor protected PackageItemInfo(android.os.Parcel);
		method protected void dumpBack(android.util.Printer, java.lang.String);
		method protected void dumpFront(android.util.Printer, java.lang.String);
		method public android.graphics.drawable.Drawable loadBanner(android.content.pm.PackageManager);
		method public android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager);
		method public java.lang.CharSequence loadLabel(android.content.pm.PackageManager);
		method public android.graphics.drawable.Drawable loadLogo(android.content.pm.PackageManager);
		method public android.content.res.XmlResourceParser loadXmlMetaData(android.content.pm.PackageManager, java.lang.String);
		method public void writeToParcel(android.os.Parcel, int);
		field public int banner;
		field public int icon;
		field public int labelRes;
		field public int logo;
		@@ -7552,12 +7556,16 @@ package android.content.pm {
		method public abstract void clearPackagePreferredActivities(java.lang.String);
		method public abstract java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]);
		method public abstract void extendVerificationTimeout(int, int, long);
		method public abstract android.graphics.drawable.Drawable getActivityBanner(android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
		method public abstract android.graphics.drawable.Drawable getActivityBanner(android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException;
		method public abstract android.graphics.drawable.Drawable getActivityIcon(android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
		method public abstract android.graphics.drawable.Drawable getActivityIcon(android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException;
		method public abstract android.content.pm.ActivityInfo getActivityInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
		method public abstract android.graphics.drawable.Drawable getActivityLogo(android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
		method public abstract android.graphics.drawable.Drawable getActivityLogo(android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException;
		method public abstract java.util.List<android.content.pm.PermissionGroupInfo> getAllPermissionGroups(int);
		method public abstract android.graphics.drawable.Drawable getApplicationBanner(android.content.pm.ApplicationInfo);
		method public abstract android.graphics.drawable.Drawable getApplicationBanner(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
		method public abstract int getApplicationEnabledSetting(java.lang.String);
		method public abstract android.graphics.drawable.Drawable getApplicationIcon(android.content.pm.ApplicationInfo);
		method public abstract android.graphics.drawable.Drawable getApplicationIcon(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
		@@ -25474,12 +25482,16 @@ package android.test.mock {
		method public void clearPackagePreferredActivities(java.lang.String);
		method public java.lang.String[] currentToCanonicalPackageNames(java.lang.String[]);
		method public void extendVerificationTimeout(int, int, long);
		method public android.graphics.drawable.Drawable getActivityBanner(android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
		method public android.graphics.drawable.Drawable getActivityBanner(android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException;
		method public android.graphics.drawable.Drawable getActivityIcon(android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
		method public android.graphics.drawable.Drawable getActivityIcon(android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException;
		method public android.content.pm.ActivityInfo getActivityInfo(android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
		method public android.graphics.drawable.Drawable getActivityLogo(android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
		method public android.graphics.drawable.Drawable getActivityLogo(android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException;
		method public java.util.List<android.content.pm.PermissionGroupInfo> getAllPermissionGroups(int);
		method public android.graphics.drawable.Drawable getApplicationBanner(android.content.pm.ApplicationInfo);
		method public android.graphics.drawable.Drawable getApplicationBanner(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;
		method public int getApplicationEnabledSetting(java.lang.String);
		method public android.graphics.drawable.Drawable getApplicationIcon(android.content.pm.ApplicationInfo);
		method public android.graphics.drawable.Drawable getApplicationIcon(java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException;

core/java/android/app/ApplicationPackageManager.java

+33 −0

Original line number	Diff line number	Diff line
		@@ -726,6 +726,39 @@ final class ApplicationPackageManager extends PackageManager {
		return getApplicationIcon(getApplicationInfo(packageName, 0));
		}

		@Override
		public Drawable getActivityBanner(ComponentName activityName)
		throws NameNotFoundException {
		return getActivityInfo(activityName, 0).loadBanner(this);
		}

		@Override
		public Drawable getActivityBanner(Intent intent)
		throws NameNotFoundException {
		if (intent.getComponent() != null) {
		return getActivityBanner(intent.getComponent());
		}

		ResolveInfo info = resolveActivity(
		intent, PackageManager.MATCH_DEFAULT_ONLY);
		if (info != null) {
		return info.activityInfo.loadBanner(this);
		}

		throw new NameNotFoundException(intent.toUri(0));
		}

		@Override
		public Drawable getApplicationBanner(ApplicationInfo info) {
		return info.loadBanner(this);
		}

		@Override
		public Drawable getApplicationBanner(String packageName)
		throws NameNotFoundException {
		return getApplicationBanner(getApplicationInfo(packageName, 0));
		}

		@Override
		public Drawable getActivityLogo(ComponentName activityName)
		throws NameNotFoundException {

core/java/android/content/pm/ComponentInfo.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -128,6 +128,17 @@ public class ComponentInfo extends PackageItemInfo {
		return logo != 0 ? logo : applicationInfo.logo;
		}

		/**
		* Return the banner resource identifier to use for this component. If the
		* component defines a banner, that is used; else, the application banner is
		* used.
		*
		* @return The banner associated with this component.
		*/
		public final int getBannerResource() {
		return banner != 0 ? banner : applicationInfo.banner;
		}

		protected void dumpFront(Printer pw, String prefix) {
		super.dumpFront(pw, prefix);
		pw.println(prefix + "enabled=" + enabled + " exported=" + exported
		@@ -172,6 +183,13 @@ public class ComponentInfo extends PackageItemInfo {
		return applicationInfo.loadIcon(pm);
		}

		/**
		* @hide
		*/
		@Override protected Drawable loadDefaultBanner(PackageManager pm) {
		return applicationInfo.loadBanner(pm);
		}

		/**
		* @hide
		*/

core/java/android/content/pm/PackageItemInfo.java

+49 −3

Original line number	Diff line number	Diff line
		@@ -66,6 +66,12 @@ public class PackageItemInfo {
		*/
		public int icon;

		/**
		* A drawable resource identifier (in the package's resources) of this
		* component's banner. From the "banner" attribute or, if not set, 0.
		*/
		public int banner;

		/**
		* A drawable resource identifier (in the package's resources) of this
		* component's logo. Logos may be larger/wider than icons and are
		@@ -92,6 +98,7 @@ public class PackageItemInfo {
		nonLocalizedLabel = orig.nonLocalizedLabel;
		if (nonLocalizedLabel != null) nonLocalizedLabel = nonLocalizedLabel.toString().trim();
		icon = orig.icon;
		banner = orig.banner;
		logo = orig.logo;
		metaData = orig.metaData;
		}
		@@ -145,6 +152,27 @@ public class PackageItemInfo {
		return loadDefaultIcon(pm);
		}

		/**
		* Retrieve the current graphical banner associated with this item. This
		* will call back on the given PackageManager to load the banner from
		* the application.
		*
		* @param pm A PackageManager from which the banner can be loaded; usually
		* the PackageManager from which you originally retrieved this item.
		*
		* @return Returns a Drawable containing the item's banner. If the item
		* does not have a banner, this method will return null.
		*/
		public Drawable loadBanner(PackageManager pm) {
		if (banner != 0) {
		Drawable dr = pm.getDrawable(packageName, banner, getApplicationInfo());
		if (dr != null) {
		return dr;
		}
		}
		return loadDefaultBanner(pm);
		}

		/**
		* Retrieve the default graphical icon associated with this item.
		*
		@@ -160,6 +188,21 @@ public class PackageItemInfo {
		return pm.getDefaultActivityIcon();
		}

		/**
		* Retrieve the default graphical banner associated with this item.
		*
		* @param pm A PackageManager from which the banner can be loaded; usually
		* the PackageManager from which you originally retrieved this item.
		*
		* @return Returns a Drawable containing the item's default banner
		* or null if no default logo is available.
		*
		* @hide
		*/
		protected Drawable loadDefaultBanner(PackageManager pm) {
		return null;
		}

		/**
		* Retrieve the current graphical logo associated with this item. This
		* will call back on the given PackageManager to load the logo from
		@@ -224,10 +267,11 @@ public class PackageItemInfo {
		pw.println(prefix + "name=" + name);
		}
		pw.println(prefix + "packageName=" + packageName);
		if (labelRes != 0 \|\| nonLocalizedLabel != null \|\| icon != 0) {
		if (labelRes != 0 \|\| nonLocalizedLabel != null \|\| icon != 0 \|\| banner != 0) {
		pw.println(prefix + "labelRes=0x" + Integer.toHexString(labelRes)
		+ " nonLocalizedLabel=" + nonLocalizedLabel
		+ " icon=0x" + Integer.toHexString(icon));
		+ " icon=0x" + Integer.toHexString(icon)
		+ " banner=0x" + Integer.toHexString(banner));
		}
		}

		@@ -243,6 +287,7 @@ public class PackageItemInfo {
		dest.writeInt(icon);
		dest.writeInt(logo);
		dest.writeBundle(metaData);
		dest.writeInt(banner);
		}

		protected PackageItemInfo(Parcel source) {
		@@ -254,6 +299,7 @@ public class PackageItemInfo {
		icon = source.readInt();
		logo = source.readInt();
		metaData = source.readBundle();
		banner = source.readInt();
		}

		/**

core/java/android/content/pm/PackageManager.java

+68 −10

Original line number	Diff line number	Diff line
		@@ -2399,6 +2399,40 @@ public abstract class PackageManager {
		public abstract Drawable getActivityIcon(Intent intent)
		throws NameNotFoundException;

		/**
		* Retrieve the banner associated with an activity. Given the full name of
		* an activity, retrieves the information about it and calls
		* {@link ComponentInfo#loadIcon ComponentInfo.loadIcon()} to return its
		* banner. If the activity cannot be found, NameNotFoundException is thrown.
		*
		* @param activityName Name of the activity whose banner is to be retrieved.
		* @return Returns the image of the banner, or null if the activity has no
		* banner specified.
		* @throws NameNotFoundException Thrown if the resources for the given
		* activity could not be loaded.
		* @see #getActivityBanner(Intent)
		*/
		public abstract Drawable getActivityBanner(ComponentName activityName)
		throws NameNotFoundException;

		/**
		* Retrieve the banner associated with an Intent. If intent.getClassName()
		* is set, this simply returns the result of
		* getActivityBanner(intent.getClassName()). Otherwise it resolves the
		* intent's component and returns the banner associated with the resolved
		* component. If intent.getClassName() cannot be found or the Intent cannot
		* be resolved to a component, NameNotFoundException is thrown.
		*
		* @param intent The intent for which you would like to retrieve a banner.
		* @return Returns the image of the banner, or null if the activity has no
		* banner specified.
		* @throws NameNotFoundException Thrown if the resources for application
		* matching the given intent could not be loaded.
		* @see #getActivityBanner(ComponentName)
		*/
		public abstract Drawable getActivityBanner(Intent intent)
		throws NameNotFoundException;

		/**
		* Return the generic icon for an activity that is used when no specific
		* icon is defined.
		@@ -2440,19 +2474,43 @@ public abstract class PackageManager {
		throws NameNotFoundException;

		/**
		* Retrieve the logo associated with an activity. Given the full name of
		* an activity, retrieves the information about it and calls
		* {@link ComponentInfo#loadLogo ComponentInfo.loadLogo()} to return its logo.
		* If the activity cannot be found, NameNotFoundException is thrown.
		* Retrieve the banner associated with an application.
		*
		* @param activityName Name of the activity whose logo is to be retrieved.
		* @param info Information about application being queried.
		* @return Returns the image of the banner or null if the application has no
		* banner specified.
		* @see #getApplicationBanner(String)
		*/
		public abstract Drawable getApplicationBanner(ApplicationInfo info);

		/**
		* Retrieve the banner associated with an application. Given the name of the
		* application's package, retrieves the information about it and calls
		* getApplicationIcon() to return its banner. If the application cannot be
		* found, NameNotFoundException is thrown.
		*
		* @return Returns the image of the logo or null if the activity has no
		* logo specified.
		* @param packageName Name of the package whose application banner is to be
		* retrieved.
		* @return Returns the image of the banner or null if the application has no
		* banner specified.
		* @throws NameNotFoundException Thrown if the resources for the given
		* application could not be loaded.
		* @see #getApplicationBanner(ApplicationInfo)
		*/
		public abstract Drawable getApplicationBanner(String packageName)
		throws NameNotFoundException;

		/**
		* Retrieve the logo associated with an activity. Given the full name of an
		* activity, retrieves the information about it and calls
		* {@link ComponentInfo#loadLogo ComponentInfo.loadLogo()} to return its
		* logo. If the activity cannot be found, NameNotFoundException is thrown.
		*
		* @param activityName Name of the activity whose logo is to be retrieved.
		* @return Returns the image of the logo or null if the activity has no logo
		* specified.
		* @throws NameNotFoundException Thrown if the resources for the given
		* activity could not be loaded.
		*
		* @see #getActivityLogo(Intent)
		*/
		public abstract Drawable getActivityLogo(ComponentName activityName)