Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "make round icon usage configurable" into nyc-mr1-dev

Browse Source
This commit is contained in:
Todd Kennedy
2016-06-09 16:48:16 +00:00
committed by Android (Google) Code Review
parent 7650c4856c a83bfca63f
commit 7b52b2eccd
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/content/pm/PackageParser.java
View File

@@ -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);

3
core/res/res/values/config.xml
View File

@@ -2489,4 +2489,7 @@
<!-- Component that is the default launcher when demo mode is enabled. -->
<string name="config_demoModeLauncherComponent"></string>
<!-- Flag indicating whether round icons should be parsed from the application manifest. -->
<bool name="config_useRoundIcon">false</bool>
</resources>

2
core/res/res/values/symbols.xml
View File

@@ -2615,4 +2615,6 @@
<!-- Used internally for assistant to launch activity transitions -->
<java-symbol type="id" name="cross_task_transition" />
<java-symbol type="bool" name="config_useRoundIcon" />
</resources>