diff options
author | Philip P. Moltmann <moltmann@google.com> | 2016-05-13 17:07:39 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-05-13 17:07:39 +0000 |
commit | 988f3bcb21b7026cfab89d22ef912f98c9c9f8a2 (patch) | |
tree | 23585b8a3a91207c19fd6e62a4c74811e6815025 /src | |
parent | f682d8970cc10e9943232cde1888d214637e610e (diff) | |
parent | 37c4bbeb3911533b279e20ad5cc104cb50ee91b5 (diff) | |
download | android_packages_apps_PackageInstaller-988f3bcb21b7026cfab89d22ef912f98c9c9f8a2.tar.gz android_packages_apps_PackageInstaller-988f3bcb21b7026cfab89d22ef912f98c9c9f8a2.tar.bz2 android_packages_apps_PackageInstaller-988f3bcb21b7026cfab89d22ef912f98c9c9f8a2.zip |
Merge "Use badged icons for permissions." into nyc-dev
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 { |