diff options
| author | Todd Kennedy <toddke@google.com> | 2016-06-09 16:48:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-09 16:48:17 +0000 |
| commit | 7b52b2eccd9634af2401a20ca78ec2eb73c1387c (patch) | |
| tree | 06346a0b5b6a3a1627b1e7a479aefe730a6ee791 /core/java/android | |
| parent | 7650c4856cbc0973f04f77946e55d5f093e1ea87 (diff) | |
| parent | a83bfca63fdc0304c69e080395aeee815fc1f2fe (diff) | |
Merge "make round icon usage configurable" into nyc-mr1-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/content/pm/PackageParser.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index fffdf717a848..f59a7dda5696 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -2511,7 +2511,6 @@ public class PackageParser { TypedArray sa = res.obtainAttributes(parser, com.android.internal.R.styleable.AndroidManifestPermissionGroup); - if (!parsePackageItemInfo(owner, perm.info, outError, "<permission-group>", sa, true /*nameRequired*/, com.android.internal.R.styleable.AndroidManifestPermissionGroup_name, @@ -3360,7 +3359,9 @@ public class PackageParser { } } - int roundIconVal = sa.getResourceId(roundIconRes, 0); + final boolean useRoundIcon = + Resources.getSystem().getBoolean(com.android.internal.R.bool.config_useRoundIcon); + int roundIconVal = useRoundIcon ? sa.getResourceId(roundIconRes, 0) : 0; if (roundIconVal != 0) { outInfo.icon = roundIconVal; outInfo.nonLocalizedLabel = null; @@ -4570,10 +4571,12 @@ public class PackageParser { outInfo.nonLocalizedLabel = v.coerceToString(); } - int roundIcon = sa.getResourceId( - com.android.internal.R.styleable.AndroidManifestIntentFilter_roundIcon, 0); - if (roundIcon != 0) { - outInfo.icon = roundIcon; + final boolean useRoundIcon = + Resources.getSystem().getBoolean(com.android.internal.R.bool.config_useRoundIcon); + int roundIconVal = useRoundIcon ? sa.getResourceId( + com.android.internal.R.styleable.AndroidManifestIntentFilter_roundIcon, 0) : 0; + if (roundIconVal != 0) { + outInfo.icon = roundIconVal; } else { outInfo.icon = sa.getResourceId( com.android.internal.R.styleable.AndroidManifestIntentFilter_icon, 0); |