commit f75baa9f4023c0cf728360806891fd344aa8f3cd
author Sunny Goyal <sunnygoyal@google.com> Tue Nov 22 03:23:51 2016 +0530
committer Sunny Goyal <sunnygoyal@google.com> Sat Dec 03 15:55:13 2016 +0530
tree 4e435203ac1763e72675b7cbd9cda480aec7e0c7
parent 36f71f873b5176fdd2b24886d0bc4371b1d5cb82

Adding support for deep shortcuts in Install queue

Bug: 32904959
Change-Id: Ida43bcf78da716defdf95eb704c31973bc390ea1

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index c7bb188..cc56d43 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -1776,9 +1776,12 @@
                 }
 
                 // Unpin shortcuts that don't exist on the workspace.
+                HashSet<ShortcutKey> pendingShortcuts =
+                        InstallShortcutReceiver.getPendingShortcuts(context);
                 for (ShortcutKey key : shortcutKeyToPinnedShortcuts.keySet()) {
                     MutableInt numTimesPinned = sBgDataModel.pinnedShortcutCounts.get(key);
-                    if (numTimesPinned == null || numTimesPinned.value == 0) {
+                    if ((numTimesPinned == null || numTimesPinned.value == 0)
+                            && !pendingShortcuts.contains(key)) {
                         // Shortcut is pinned but doesn't exist on the workspace; unpin it.
                         shortcutManager.unpinShortcut(key);
                     }