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

Commit 2dae34b6 authored by Mady Mellor's avatar Mady Mellor
Browse files

Default to app icon if the icon can't be found 

Test: manual - have app with bad icon, ensure that bubble shows app icon
Change-Id: I889b02f54e66eaad12ec0094ccf0b7932730ef01
parent ba5a5356

packages/SystemUI/src/com/android/systemui/bubbles/BubbleViewInfoTask.java

+7 −1
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask 
            PackageManager pm = c.getPackageManager();

            ApplicationInfo appInfo;

            Drawable badgedIcon;

            Drawable appIcon;

            try {

                appInfo = pm.getApplicationInfo(

                        packageName,
@@ -167,7 +168,7 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask 
                if (appInfo != null) {

                    info.appName = String.valueOf(pm.getApplicationLabel(appInfo));

                }

                Drawable appIcon = pm.getApplicationIcon(packageName);

                appIcon = pm.getApplicationIcon(packageName);

                badgedIcon = pm.getUserBadgedIcon(appIcon, sbn.getUser());

            } catch (PackageManager.NameNotFoundException exception) {

                // If we can't find package... don't think we should show the bubble.
@@ -178,6 +179,11 @@ public class BubbleViewInfoTask extends AsyncTask<Void, Void, BubbleViewInfoTask 
            // Badged bubble image

            Drawable bubbleDrawable = iconFactory.getBubbleDrawable(c, info.shortcutInfo,

                    b.getEntry().getBubbleMetadata());

            if (bubbleDrawable == null) {

                // Default to app icon

                bubbleDrawable = appIcon;

            }



            BitmapInfo badgeBitmapInfo = iconFactory.getBadgeBitmap(badgedIcon);

            info.badgedBubbleImage = iconFactory.getBubbleBitmap(bubbleDrawable,

                    badgeBitmapInfo).icon;