diff options
author | Philip P. Moltmann <moltmann@google.com> | 2016-05-11 16:27:14 -0700 |
---|---|---|
committer | Philip P. Moltmann <moltmann@google.com> | 2016-05-11 16:51:45 -0700 |
commit | 37c4bbeb3911533b279e20ad5cc104cb50ee91b5 (patch) | |
tree | 15ca21e5f103765126bad545460104111952be5d /src | |
parent | 1dba1776c3fd432fd9adb5e3e251b6562aca7f3c (diff) | |
download | android_packages_apps_PackageInstaller-37c4bbeb3911533b279e20ad5cc104cb50ee91b5.tar.gz android_packages_apps_PackageInstaller-37c4bbeb3911533b279e20ad5cc104cb50ee91b5.tar.bz2 android_packages_apps_PackageInstaller-37c4bbeb3911533b279e20ad5cc104cb50ee91b5.zip |
Use badged icons for permissions.
Please note that the labels stay unbadged. I.e. The label will always be
"Contacts" instead of "Work Contacts".
Fixes: 28403737
Change-Id: Ib994db946b07098a8c0f95eab5787fb30532fe62
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/packageinstaller/permission/model/PermissionApps.java | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/com/android/packageinstaller/permission/model/PermissionApps.java b/src/com/android/packageinstaller/permission/model/PermissionApps.java index 2025420e..be32f2ac 100644 --- a/src/com/android/packageinstaller/permission/model/PermissionApps.java +++ b/src/com/android/packageinstaller/permission/model/PermissionApps.java @@ -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 { |