Merge "Use badged icons for permissions." into nyc-dev (988f3bcb) · Commits · e / os / android_packages_apps_PackageInstaller

src/com/android/packageinstaller/permission/model/PermissionApps.java

+12 −10

Original line number	Diff line number	Diff line
		@@ -196,8 +196,18 @@ public class PermissionApps {

		String label = mSkipUi ? app.packageName
		: app.applicationInfo.loadLabel(mPm).toString();
		PermissionApp permApp = new PermissionApp(app.packageName,
		group, label, getBadgedIcon(app.applicationInfo),

		Drawable icon = null;
		if (!mSkipUi) {
		UserHandle userHandle = new UserHandle(
		UserHandle.getUserId(group.getApp().applicationInfo.uid));

		icon = mPm.getUserBadgedIcon(
		mPm.loadUnbadgedItemIcon(app.applicationInfo, app.applicationInfo),
		userHandle);
		}

		PermissionApp permApp = new PermissionApp(app.packageName, group, label, icon,
		app.applicationInfo);

		permApps.add(permApp);
		@@ -251,14 +261,6 @@ public class PermissionApps {
		return null;
		}

		private Drawable getBadgedIcon(ApplicationInfo appInfo) {
		if (mSkipUi) {
		return null;
		}
		Drawable unbadged = appInfo.loadUnbadgedIcon(mPm);
		return mPm.getUserBadgedIcon(unbadged, Process.myUserHandle());
		}

		private void loadGroupInfo() {
		PackageItemInfo info;
		try {