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

Commit a7093145 authored by Alexandra Gherghina's avatar Alexandra Gherghina
Browse files

Use the appropriate default icon 

ComponentInfo subclasses and ApplicationInfo have different ways to retrieving
the default icon. Previously, in CL I2db300a69a08030eacc245ee91556f0443ba5878
we defaulted everything to the green Android. This makes sure that they get the
right default.

Bug: 16630068
Change-Id: Ifa499eac6f1543523d6ecf0831175bfd6b772edb
parent 9d8ca0f0

core/java/android/app/ApplicationPackageManager.java

+1 −1
Original line number Diff line number Diff line
@@ -1624,7 +1624,7 @@ final class ApplicationPackageManager extends PackageManager { 
        }

        Drawable dr = getDrawable(itemInfo.packageName, itemInfo.icon, appInfo);

        if (dr == null) {

            dr = getDefaultActivityIcon();

            dr = itemInfo.loadDefaultIcon(this);

        }

        return getUserManager().getBadgedDrawableForUser(dr,

                new UserHandle(mContext.getUserId()));

core/java/android/content/pm/ApplicationInfo.java

+2 −1
Original line number Diff line number Diff line
@@ -839,7 +839,8 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
    /**

     * @hide

     */

    @Override protected Drawable loadDefaultIcon(PackageManager pm) {

    @Override

    public Drawable loadDefaultIcon(PackageManager pm) {

        if ((flags & FLAG_EXTERNAL_STORAGE) != 0

                && isPackageUnavailable(pm)) {

            return Resources.getSystem().getDrawable(

core/java/android/content/pm/ComponentInfo.java

+2 −1
Original line number Diff line number Diff line
@@ -179,7 +179,8 @@ public class ComponentInfo extends PackageItemInfo { 
    /**

     * @hide

     */

    @Override protected Drawable loadDefaultIcon(PackageManager pm) {

    @Override

    public Drawable loadDefaultIcon(PackageManager pm) {

        return applicationInfo.loadIcon(pm);

    }

core/java/android/content/pm/PackageItemInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ public class PackageItemInfo { 
     * 

     * @hide

     */

    protected Drawable loadDefaultIcon(PackageManager pm) {

    public Drawable loadDefaultIcon(PackageManager pm) {

        return pm.getDefaultActivityIcon();

    }