Removing static state management from the install shortcut queue

Change-Id: I0b74a843b2081ee314e0840d5ea8ab8ddabde32b
This commit is contained in:
Sunny Goyal
2020-08-12 13:59:27 -07:00
parent 73f0c3698f
commit 60e68c91e9
8 changed files with 113 additions and 65 deletions

View File

@@ -31,7 +31,6 @@ import android.text.TextUtils;
import android.util.ArraySet;
import android.util.Log;
import com.android.launcher3.InstallShortcutReceiver;
import com.android.launcher3.LauncherSettings;
import com.android.launcher3.LauncherSettings.Favorites;
import com.android.launcher3.Workspace;
@@ -298,7 +297,7 @@ public class BgDataModel {
.filter(wi -> wi.itemType == Favorites.ITEM_TYPE_DEEP_SHORTCUT)
.map(ShortcutKey::fromItemInfo),
// Pending shortcuts
InstallShortcutReceiver.getPendingShortcuts(context)
ItemInstallQueue.INSTANCE.get(context).getPendingShortcuts()
.stream().filter(si -> si.user.equals(user)))
.collect(groupingBy(ShortcutKey::getPackageName,
mapping(ShortcutKey::getId, Collectors.toSet())));