From dedfca2aef7573624bdb421b1805ef5e04bee502 Mon Sep 17 00:00:00 2001 From: Adam Cohen Date: Mon, 19 May 2014 15:10:39 -0700 Subject: Preventing crash when hovering over folder icon with widget shortcut issue 13748105 Change-Id: I053f6c7748310ad117ec216655e6147bfe6e4f85 --- src/com/android/launcher3/FolderIcon.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java index 25c496288..4a701d558 100644 --- a/src/com/android/launcher3/FolderIcon.java +++ b/src/com/android/launcher3/FolderIcon.java @@ -344,7 +344,12 @@ public class FolderIcon extends FrameLayout implements FolderListener { mFolderRingAnimator.animateToAcceptState(); layout.showFolderAccept(mFolderRingAnimator); mOpenAlarm.setOnAlarmListener(mOnOpenListener); - if (SPRING_LOADING_ENABLED) { + if (SPRING_LOADING_ENABLED && + ((dragInfo instanceof AppInfo) || (dragInfo instanceof ShortcutInfo))) { + // TODO: we currently don't support spring-loading for PendingAddShortcutInfos even + // though widget-style shortcuts can be added to folders. The issue is that we need + // to deal with configuration activities which are currently handled in + // Workspace#onDropExternal. mOpenAlarm.setAlarm(ON_OPEN_DELAY); } mDragInfo = (ItemInfo) dragInfo; @@ -362,6 +367,7 @@ public class FolderIcon extends FrameLayout implements FolderListener { item.spanX = 1; item.spanY = 1; } else { + // ShortcutInfo item = (ShortcutInfo) mDragInfo; } mFolder.beginExternalDrag(item); -- cgit v1.2.3