diff options
author | Tony Wickham <twickham@google.com> | 2016-07-28 12:31:28 -0700 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2016-07-28 12:31:28 -0700 |
commit | ca258b36be07f4835c9cc5fbc3e84e9851647dce (patch) | |
tree | d9025017acc657325fc5f82c0adadf2144303d06 /src/com/android/launcher3/LauncherModel.java | |
parent | 55f5bd730cace56d224de33461f575f41bdd480f (diff) | |
download | android_packages_apps_Trebuchet-ca258b36be07f4835c9cc5fbc3e84e9851647dce.tar.gz android_packages_apps_Trebuchet-ca258b36be07f4835c9cc5fbc3e84e9851647dce.tar.bz2 android_packages_apps_Trebuchet-ca258b36be07f4835c9cc5fbc3e84e9851647dce.zip |
Only add shortcuts to the deep shortcut map if they are dynamic/manifest.
Bug: 30475465
Change-Id: I93aff6330b86a3bfa3e6b5741ab759d835618f0b
Diffstat (limited to 'src/com/android/launcher3/LauncherModel.java')
-rw-r--r-- | src/com/android/launcher3/LauncherModel.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index b42f80c0f..b465b3a4a 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -2842,7 +2842,9 @@ public class LauncherModel extends BroadcastReceiver // 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()); |