commit ca258b36be07f4835c9cc5fbc3e84e9851647dce
author Tony Wickham <twickham@google.com> Thu Jul 28 12:31:28 2016 -0700
committer Tony Wickham <twickham@google.com> Thu Jul 28 12:31:28 2016 -0700
tree d9025017acc657325fc5f82c0adadf2144303d06
parent 55f5bd730cace56d224de33461f575f41bdd480f

Only add shortcuts to the deep shortcut map if they are dynamic/manifest.

Bug: 30475465
Change-Id: I93aff6330b86a3bfa3e6b5741ab759d835618f0b

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index b42f80c..b465b3a 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -2842,7 +2842,9 @@
 
         // Now add the new shortcuts to the map.
         for (ShortcutInfoCompat shortcut : shortcuts) {
-            if (shortcut.isEnabled()) {
+            boolean shouldShowInContainer = shortcut.isEnabled()
+                    && (shortcut.isDeclaredInManifest() || shortcut.isDynamic());
+            if (shouldShowInContainer) {
                 ComponentKey targetComponent
                         = new ComponentKey(shortcut.getActivity(), shortcut.getUserHandle());
                 mBgDeepShortcutMap.addToList(targetComponent, shortcut.getId());