Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3ee9a4f authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge "Use badged icons for permissions." into nyc-dev 

am: 988f3bcb

* commit '988f3bcb':
  Use badged icons for permissions.

Change-Id: I983ca6b1a207f929a0c97f303b2823964f64a84b
parents d7a94d9e 988f3bcb

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 {