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

Use last saved icon if pinned shortcut is unpublished

Browse Source 
Bug: 62814533
Change-Id: I683bd6abdf17defc55c0f17d8688951d4841c066
This commit is contained in:
Tony Wickham
2017-06-29 18:49:22 -07:00
parent 6f7f4bb97e
commit 5fe66e3eef
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/launcher3/model/LoaderTask.java
View File

@@ -24,8 +24,8 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.LauncherActivityInfo;
import android.content.pm.PackageInstaller;
import android.graphics.Bitmap;
import android.os.Handler;
import android.os.Looper;
import android.os.Process;
import android.os.SystemClock;
import android.os.Trace;
@@ -66,6 +66,7 @@ import com.android.launcher3.util.LooperIdleLock;
import com.android.launcher3.util.ManagedProfileHeuristic;
import com.android.launcher3.util.MultiHashMap;
import com.android.launcher3.util.PackageManagerHelper;
import com.android.launcher3.util.Provider;
import java.util.ArrayList;
import java.util.Collections;
@@ -459,8 +460,18 @@ public class LoaderTask implements Runnable {
continue;
}
info = new ShortcutInfo(pinnedShortcut, context);
final ShortcutInfo finalInfo = info;
Provider<Bitmap> fallbackIconProvider = new Provider<Bitmap>() {
@Override
public Bitmap get() {
// If the pinned deep shortcut is no longer published,
// use the last saved icon instead of the default.
return c.loadIcon(finalInfo);
}
};
info.iconBitmap = LauncherIcons
.createShortcutIcon(pinnedShortcut, context);
.createShortcutIcon(pinnedShortcut, context,
true /* badged */, fallbackIconProvider);
if (pmHelper.isAppSuspended(
pinnedShortcut.getPackage(), info.user)) {
info.isDisabled |= ShortcutInfo.FLAG_DISABLED_SUSPENDED;