diff options
author | Adam Cohen <adamcohen@google.com> | 2014-05-20 00:44:37 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-20 00:44:37 +0000 |
commit | a6609e7762c8d9197124fc5ea3fea598e3d9de1a (patch) | |
tree | 8432b17104a2742c07a7271e3f9af1b94ae71354 | |
parent | 28c48f9385b3c6bdfbcbbb3ed1cc859a821357f5 (diff) | |
parent | dedfca2aef7573624bdb421b1805ef5e04bee502 (diff) | |
download | android_packages_apps_Trebuchet-a6609e7762c8d9197124fc5ea3fea598e3d9de1a.tar.gz android_packages_apps_Trebuchet-a6609e7762c8d9197124fc5ea3fea598e3d9de1a.tar.bz2 android_packages_apps_Trebuchet-a6609e7762c8d9197124fc5ea3fea598e3d9de1a.zip |
am dedfca2a: Preventing crash when hovering over folder icon with widget shortcut
* commit 'dedfca2aef7573624bdb421b1805ef5e04bee502':
Preventing crash when hovering over folder icon with widget shortcut
-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); |