aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 03:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Refrain from overwriting shortcut icon with default icon" into rvc-qpr-dev am: 3cdba9d5b5

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/12516071

Change-Id: Id8df8e16f9649a5fb1c9b28146843b9eff595246
This commit is contained in:
TreeHugger Robot
2020-09-08 23:10:47 +00:00
committed by Automerger Merge Worker
parent abf186c4f5 3cdba9d5b5
commit 837e8d58fe
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/launcher3/icons/IconCache.java
View File

@@ -67,8 +67,8 @@ public class IconCache extends BaseIconCache {
private static final String TAG = "Launcher.IconCache";
private final Predicate<ItemInfoWithIcon> mIsUsingFallbackIconCheck = w -> w.bitmap != null
&& w.bitmap.isNullOrLowRes() && !isDefaultIcon(w.bitmap, w.user);
private final Predicate<ItemInfoWithIcon> mIsUsingFallbackOrNonDefaultIconCheck = w ->
w.bitmap != null && (w.bitmap.isNullOrLowRes() || !isDefaultIcon(w.bitmap, w.user));
private final CachingLogic<ComponentWithLabel> mComponentWithLabelCachingLogic;
private final CachingLogic<LauncherActivityInfo> mLauncherActivityInfoCachingLogic;
@@ -192,14 +192,14 @@ public class IconCache extends BaseIconCache {
* Fill in {@param info} with the icon for {@param si}
*/
public void getShortcutIcon(ItemInfoWithIcon info, ShortcutInfo si) {
getShortcutIcon(info, si, true, mIsUsingFallbackIconCheck);
getShortcutIcon(info, si, true, mIsUsingFallbackOrNonDefaultIconCheck);
}
/**
* Fill in {@param info} with an unbadged icon for {@param si}
*/
public void getUnbadgedShortcutIcon(ItemInfoWithIcon info, ShortcutInfo si) {
getShortcutIcon(info, si, false, mIsUsingFallbackIconCheck);
getShortcutIcon(info, si, false, mIsUsingFallbackOrNonDefaultIconCheck);
}
/**