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

Commit 0e4ebc9f authored by Charlie Anderson's avatar Charlie Anderson Committed by Cherrypicker Worker
Browse files

Fix blank pink loading icons by ensuring that cache entry won't downgrade existing icon. 

Bug: 326607598
Test: manually tested B&R
Flag: N/A
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d073ab0b3922eb0320a6bc2141cd4a57593a0cac)
Merged-In: I8aac643ec5ca3162cd62bf1051cc751800c626dd
Change-Id: I8aac643ec5ca3162cd62bf1051cc751800c626dd
parent a876ea9e

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.");

        }

    }