commit 8d14e4970931d6d9bb5648bdaf608b58044b51ae
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 02 20:07:29 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 02 20:07:31 2017 +0000
tree 164f075b4ba0794ff99c4fa91e67777565489b6d
parent ccb25a3da88a0e68039f8fa15c9709b181f4e2e8
parent 869a97da73504a01a51771a7ef96a9380fcd2d12

Merge "Promise icons don't support popup" into ub-launcher3-dorval-polish

src/com/android/launcher3/shortcuts/DeepShortcutManager.java

diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutManager.java b/src/com/android/launcher3/shortcuts/DeepShortcutManager.java
index df7f695..5ce78dc 100644
--- a/src/com/android/launcher3/shortcuts/DeepShortcutManager.java
+++ b/src/com/android/launcher3/shortcuts/DeepShortcutManager.java
@@ -65,8 +65,10 @@
     }
 
     public static boolean supportsShortcuts(ItemInfo info) {
+        boolean isItemPromise = info instanceof com.android.launcher3.ShortcutInfo
+                && ((com.android.launcher3.ShortcutInfo) info).isPromise();
         return info.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION
-                && !info.isDisabled();
+                && !info.isDisabled() && !isItemPromise;
     }
 
     public boolean wasLastCallSuccess() {