diff options
author | Adam Cohen <adamcohen@google.com> | 2014-05-19 15:10:39 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2014-05-19 15:25:39 -0700 |
commit | dedfca2aef7573624bdb421b1805ef5e04bee502 (patch) | |
tree | 8432b17104a2742c07a7271e3f9af1b94ae71354 /src/com/android/launcher3/FolderIcon.java | |
parent | 5eed5d8c7b7ca78dd07bc6d441600cb97e0782a1 (diff) | |
download | android_packages_apps_Trebuchet-dedfca2aef7573624bdb421b1805ef5e04bee502.tar.gz android_packages_apps_Trebuchet-dedfca2aef7573624bdb421b1805ef5e04bee502.tar.bz2 android_packages_apps_Trebuchet-dedfca2aef7573624bdb421b1805ef5e04bee502.zip |
Preventing crash when hovering over folder icon with widget shortcut
issue 13748105
Change-Id: I053f6c7748310ad117ec216655e6147bfe6e4f85
Diffstat (limited to 'src/com/android/launcher3/FolderIcon.java')
-rw-r--r-- | src/com/android/launcher3/FolderIcon.java | 8 |
1 files changed, 7 insertions, 1 deletions
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); |