diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-06-02 20:07:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-02 20:07:31 +0000 |
| commit | 8d14e4970931d6d9bb5648bdaf608b58044b51ae (patch) | |
| tree | 164f075b4ba0794ff99c4fa91e67777565489b6d | |
| parent | ccb25a3da88a0e68039f8fa15c9709b181f4e2e8 (diff) | |
| parent | 869a97da73504a01a51771a7ef96a9380fcd2d12 (diff) | |
| download | android_packages_apps_Trebuchet-8d14e4970931d6d9bb5648bdaf608b58044b51ae.tar.gz android_packages_apps_Trebuchet-8d14e4970931d6d9bb5648bdaf608b58044b51ae.tar.bz2 android_packages_apps_Trebuchet-8d14e4970931d6d9bb5648bdaf608b58044b51ae.zip | |
Merge "Promise icons don't support popup" into ub-launcher3-dorval-polish
| -rw-r--r-- | src/com/android/launcher3/shortcuts/DeepShortcutManager.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher3/shortcuts/DeepShortcutManager.java b/src/com/android/launcher3/shortcuts/DeepShortcutManager.java index df7f6954d..5ce78dc3a 100644 --- a/src/com/android/launcher3/shortcuts/DeepShortcutManager.java +++ b/src/com/android/launcher3/shortcuts/DeepShortcutManager.java @@ -65,8 +65,10 @@ public class DeepShortcutManager { } 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() { |