diff options
author | Dianne Hackborn <hackbod@google.com> | 2010-09-24 17:18:53 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2010-09-24 18:00:47 -0700 |
commit | 234e42df5fac958ed9f15aae6005dd72e4bdf08a (patch) | |
tree | bd8c19fa7b2ad259e7ffde09bbcb99638456a7e3 /core | |
parent | 88aa072aab9f4b38e44749ad7d8f2fb6c3f8920f (diff) | |
download | frameworks_base-234e42df5fac958ed9f15aae6005dd72e4bdf08a.zip frameworks_base-234e42df5fac958ed9f15aae6005dd72e4bdf08a.tar.gz frameworks_base-234e42df5fac958ed9f15aae6005dd72e4bdf08a.tar.bz2 |
DO NOT MERGE. Fix issue #3000764: API REVIEW: android.R.*
Not going out in GB.
Change-Id: I9d4f5938ec7d2a54c0f72b8eb5a177ee66f12146
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/content/pm/PackageParser.java | 39 | ||||
-rw-r--r-- | core/res/res/values/attrs_manifest.xml | 18 |
2 files changed, 12 insertions, 45 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index e20cb5e..1f21672 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -1252,8 +1252,7 @@ public class PackageParser { "<permission-group>", sa, com.android.internal.R.styleable.AndroidManifestPermissionGroup_name, com.android.internal.R.styleable.AndroidManifestPermissionGroup_label, - com.android.internal.R.styleable.AndroidManifestPermissionGroup_icon, - com.android.internal.R.styleable.AndroidManifestPermissionGroup_logo)) { + com.android.internal.R.styleable.AndroidManifestPermissionGroup_icon, 0)) { sa.recycle(); mParseError = PackageManager.INSTALL_PARSE_FAILED_MANIFEST_MALFORMED; return null; @@ -1288,8 +1287,7 @@ public class PackageParser { "<permission>", sa, com.android.internal.R.styleable.AndroidManifestPermission_name, com.android.internal.R.styleable.AndroidManifestPermission_label, - com.android.internal.R.styleable.AndroidManifestPermission_icon, - com.android.internal.R.styleable.AndroidManifestPermission_logo)) { + com.android.internal.R.styleable.AndroidManifestPermission_icon, 0)) { sa.recycle(); mParseError = PackageManager.INSTALL_PARSE_FAILED_MANIFEST_MALFORMED; return null; @@ -1342,8 +1340,7 @@ public class PackageParser { "<permission-tree>", sa, com.android.internal.R.styleable.AndroidManifestPermissionTree_name, com.android.internal.R.styleable.AndroidManifestPermissionTree_label, - com.android.internal.R.styleable.AndroidManifestPermissionTree_icon, - com.android.internal.R.styleable.AndroidManifestPermissionTree_logo)) { + com.android.internal.R.styleable.AndroidManifestPermissionTree_icon, 0)) { sa.recycle(); mParseError = PackageManager.INSTALL_PARSE_FAILED_MANIFEST_MALFORMED; return null; @@ -1387,8 +1384,7 @@ public class PackageParser { mParseInstrumentationArgs = new ParsePackageItemArgs(owner, outError, com.android.internal.R.styleable.AndroidManifestInstrumentation_name, com.android.internal.R.styleable.AndroidManifestInstrumentation_label, - com.android.internal.R.styleable.AndroidManifestInstrumentation_icon, - com.android.internal.R.styleable.AndroidManifestInstrumentation_logo); + com.android.internal.R.styleable.AndroidManifestInstrumentation_icon, 0); mParseInstrumentationArgs.tag = "<instrumentation>"; } @@ -1500,8 +1496,6 @@ public class PackageParser { ai.icon = sa.getResourceId( com.android.internal.R.styleable.AndroidManifestApplication_icon, 0); - ai.logo = sa.getResourceId( - com.android.internal.R.styleable.AndroidManifestApplication_logo, 0); ai.theme = sa.getResourceId( com.android.internal.R.styleable.AndroidManifestApplication_theme, 0); ai.descriptionRes = sa.getResourceId( @@ -1761,11 +1755,6 @@ public class PackageParser { outInfo.nonLocalizedLabel = null; } - int logoVal = sa.getResourceId(logoRes, 0); - if (logoVal != 0) { - outInfo.logo = logoVal; - } - TypedValue v = sa.peekValue(labelRes); if (v != null && (outInfo.labelRes=v.resourceId) == 0) { outInfo.nonLocalizedLabel = v.coerceToString(); @@ -1786,8 +1775,7 @@ public class PackageParser { mParseActivityArgs = new ParseComponentArgs(owner, outError, com.android.internal.R.styleable.AndroidManifestActivity_name, com.android.internal.R.styleable.AndroidManifestActivity_label, - com.android.internal.R.styleable.AndroidManifestActivity_icon, - com.android.internal.R.styleable.AndroidManifestActivity_logo, + com.android.internal.R.styleable.AndroidManifestActivity_icon, 0, mSeparateProcesses, com.android.internal.R.styleable.AndroidManifestActivity_process, com.android.internal.R.styleable.AndroidManifestActivity_description, @@ -1997,8 +1985,7 @@ public class PackageParser { mParseActivityAliasArgs = new ParseComponentArgs(owner, outError, com.android.internal.R.styleable.AndroidManifestActivityAlias_name, com.android.internal.R.styleable.AndroidManifestActivityAlias_label, - com.android.internal.R.styleable.AndroidManifestActivityAlias_icon, - com.android.internal.R.styleable.AndroidManifestActivityAlias_logo, + com.android.internal.R.styleable.AndroidManifestActivityAlias_icon, 0, mSeparateProcesses, 0, com.android.internal.R.styleable.AndroidManifestActivityAlias_description, @@ -2126,8 +2113,7 @@ public class PackageParser { mParseProviderArgs = new ParseComponentArgs(owner, outError, com.android.internal.R.styleable.AndroidManifestProvider_name, com.android.internal.R.styleable.AndroidManifestProvider_label, - com.android.internal.R.styleable.AndroidManifestProvider_icon, - com.android.internal.R.styleable.AndroidManifestProvider_logo, + com.android.internal.R.styleable.AndroidManifestProvider_icon, 0, mSeparateProcesses, com.android.internal.R.styleable.AndroidManifestProvider_process, com.android.internal.R.styleable.AndroidManifestProvider_description, @@ -2399,8 +2385,7 @@ public class PackageParser { mParseServiceArgs = new ParseComponentArgs(owner, outError, com.android.internal.R.styleable.AndroidManifestService_name, com.android.internal.R.styleable.AndroidManifestService_label, - com.android.internal.R.styleable.AndroidManifestService_icon, - com.android.internal.R.styleable.AndroidManifestService_logo, + com.android.internal.R.styleable.AndroidManifestService_icon, 0, mSeparateProcesses, com.android.internal.R.styleable.AndroidManifestService_process, com.android.internal.R.styleable.AndroidManifestService_description, @@ -2614,9 +2599,6 @@ public class PackageParser { outInfo.icon = sa.getResourceId( com.android.internal.R.styleable.AndroidManifestIntentFilter_icon, 0); - outInfo.logo = sa.getResourceId( - com.android.internal.R.styleable.AndroidManifestIntentFilter_logo, 0); - sa.recycle(); int outerDepth = parser.getDepth(); @@ -2884,11 +2866,6 @@ public class PackageParser { outInfo.nonLocalizedLabel = null; } - int logoVal = args.sa.getResourceId(args.logoRes, 0); - if (logoVal != 0) { - outInfo.logo = logoVal; - } - TypedValue v = args.sa.peekValue(args.labelRes); if (v != null && (outInfo.labelRes=v.resourceId) == 0) { outInfo.nonLocalizedLabel = v.coerceToString(); diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index fb49120..a8c00a6 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -75,7 +75,8 @@ header in the Action Bar. The primary differences between an icon and a logo are that logos are often wider and more detailed, and are used without an accompanying text caption. This must be a reference - to a Drawable resource containing the image definition. --> + to a Drawable resource containing the image definition. + @hide --> <attr name="logo" format="reference" /> <!-- Name of the activity to be launched to manage application's space on @@ -399,7 +400,8 @@ <attr name="syncable" format="boolean" /> <!-- Flag declaring this activity to be 'immersive'; immersive activities - should not be interrupted with other activities or notifications. --> + should not be interrupted with other activities or notifications. + @hide --> <attr name="immersive" format="boolean" /> <!-- Specify the order in which content providers hosted by a process @@ -715,7 +717,6 @@ <attr name="theme" /> <attr name="label" /> <attr name="icon" /> - <attr name="logo" /> <attr name="description" /> <attr name="permission" /> <attr name="process" /> @@ -774,7 +775,6 @@ <attr name="name" /> <attr name="label" /> <attr name="icon" /> - <attr name="logo" /> <attr name="permissionGroup" /> <attr name="description" /> <attr name="protectionLevel" /> @@ -799,7 +799,6 @@ <attr name="name" /> <attr name="label" /> <attr name="icon" /> - <attr name="logo" /> <attr name="description" /> </declare-styleable> @@ -829,7 +828,6 @@ <attr name="name" /> <attr name="label" /> <attr name="icon" /> - <attr name="logo" /> </declare-styleable> <!-- The <code>uses-permission</code> tag requests a @@ -1034,7 +1032,6 @@ <attr name="label" /> <attr name="description" /> <attr name="icon" /> - <attr name="logo" /> <attr name="process" /> <attr name="authorities" /> <attr name="syncable" /> @@ -1114,7 +1111,6 @@ <attr name="label" /> <attr name="description" /> <attr name="icon" /> - <attr name="logo" /> <attr name="permission" /> <attr name="process" /> <!-- Specify whether the service is enabled or not (that is, can be instantiated by the system). @@ -1147,7 +1143,6 @@ <attr name="label" /> <attr name="description" /> <attr name="icon" /> - <attr name="logo" /> <attr name="permission" /> <attr name="process" /> <!-- Specify whether the receiver is enabled or not (that is, can be instantiated by the system). @@ -1180,7 +1175,6 @@ <attr name="label" /> <attr name="description" /> <attr name="icon" /> - <attr name="logo" /> <attr name="launchMode" /> <attr name="screenOrientation" /> <attr name="configChanges" /> @@ -1206,7 +1200,6 @@ this activity. A value besides "unspecified" here overrides any value in the theme. --> <attr name="windowSoftInputMode" /> - <attr name="immersive" /> </declare-styleable> <!-- The <code>activity-alias</code> tag declares a new @@ -1235,7 +1228,6 @@ <attr name="label" /> <attr name="description" /> <attr name="icon" /> - <attr name="logo" /> <attr name="permission" /> <!-- Specify whether the activity-alias is enabled or not (that is, can be instantiated by the system). It can also be specified for an application as a whole, in which case a value of "false" @@ -1305,7 +1297,6 @@ parent="AndroidManifestActivity AndroidManifestReceiver AndroidManifestService"> <attr name="label" /> <attr name="icon" /> - <attr name="logo" /> <attr name="priority" /> </declare-styleable> @@ -1412,7 +1403,6 @@ <attr name="targetPackage" /> <attr name="label" /> <attr name="icon" /> - <attr name="logo" /> <attr name="handleProfiling" /> <attr name="functionalTest" /> </declare-styleable> |