Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6609e77 authored by Adam Cohen's avatar Adam Cohen Committed by Android Git Automerger
Browse files

am dedfca2a: Preventing crash when hovering over folder icon with widget shortcut 

* commit 'dedfca2a':
  Preventing crash when hovering over folder icon with widget shortcut
parents 28c48f93 dedfca2a

src/com/android/launcher3/FolderIcon.java

+7 −1
Original line number Diff line number Diff line
@@ -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);