diff options
author | Philip P. Moltmann <moltmann@google.com> | 2016-05-13 17:14:15 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-05-13 17:14:15 +0000 |
commit | 406a4ca6ce9530da2b1f07f5c6e300ebb6c77f33 (patch) | |
tree | 27602d26045560fb9e27b02fcb8fd36f5ff746cf /src | |
parent | 1955aa17aa83576ff02f068b29cd4998c4b1d8d6 (diff) | |
parent | 988f3bcb21b7026cfab89d22ef912f98c9c9f8a2 (diff) | |
download | android_packages_apps_PackageInstaller-406a4ca6ce9530da2b1f07f5c6e300ebb6c77f33.tar.gz android_packages_apps_PackageInstaller-406a4ca6ce9530da2b1f07f5c6e300ebb6c77f33.tar.bz2 android_packages_apps_PackageInstaller-406a4ca6ce9530da2b1f07f5c6e300ebb6c77f33.zip |
Merge "Use badged icons for permissions." into nyc-dev
am: 988f3bcb21
* commit '988f3bcb21b7026cfab89d22ef912f98c9c9f8a2':
Use badged icons for permissions.
Change-Id: I922e3df467d31be00c80128c91330b381853ce70
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 { |