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

Commit 9f03ea25 authored by Charlie Anderson's avatar Charlie Anderson Committed by Android (Google) Code Review
Browse files

Merge "Fix blank pink loading icons by ensuring that cache entry won't... 

Merge "Fix blank pink loading icons by ensuring that cache entry won't downgrade existing icon." into 24D1-dev
parents 4d484ce8 0e4ebc9f

src/com/android/launcher3/icons/IconCache.java

+6 −1
Original line number Diff line number Diff line
@@ -373,8 +373,13 @@ public class IconCache extends BaseIconCache { 
                    infoInOut.user, activityInfoProvider, mLauncherActivityInfoCachingLogic,

                    usePkgIcon, useLowResIcon);

            applyPackageEntry(packageEntry, infoInOut, entry);

        } else {

        } else if (useLowResIcon || !entry.bitmap.isNullOrLowRes()

                || infoInOut.bitmap.isNullOrLowRes()) {

            // Only use cache entry if it will not downgrade the current bitmap in infoInOut

            applyCacheEntry(entry, infoInOut);

        } else {

            Log.d(TAG, "getTitleAndIcon: Cache entry bitmap was a downgrade of existing bitmap"

                    + " in ItemInfo. Skipping.");

        }

    }