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

Commit 2adf2f13 authored by Saalim Quadri's avatar Saalim Quadri
Browse files

Merge branch '3346-a15-folder' into 'a15' 

feat: Don't close folder on wiggle

See merge request e/os/BlissLauncher3!125
parents f3295f8e 7a97ca4c

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer, 


            // Close any opened folder

            Folder folder = Folder.getOpen(this);

            if (folder != null && folder.isOpen()) {

            if (folder != null && folder.isOpen() && !folder.isFolderWobbling()) {

                folder.close(false);

            }

        }

src/com/android/launcher3/folder/Folder.java

+6 −0
Original line number Diff line number Diff line
@@ -341,6 +341,12 @@ public class Folder extends AbstractFloatingView implements ClipPathView, DragSo 
        return mLauncherDelegate.isDraggingEnabled();

    }



    public boolean isFolderWobbling() {

        Launcher launcher = mLauncherDelegate.getLauncher();

        if (launcher == null) return false;

        return launcher.getWorkspace().isWobbling();

    }



    public boolean startDrag(View v, DragOptions options) {

        Object tag = v.getTag();

        if (tag instanceof ItemInfo item) {