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

Commit 37c4bbeb authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

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
parent 1dba1776

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 {