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

Commit bcd56b8f authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

feat: Don't close opened folder

parent 2ab12398

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

+7 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.android.launcher3.Workspace; 
import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.appprediction.PredictionRowView;

import com.android.launcher3.folder.Folder;

import com.android.launcher3.hybridhotseat.HotseatPredictionController;

import com.android.launcher3.logging.InstanceId;

import com.android.launcher3.logging.StatsLogManager;
@@ -228,6 +229,12 @@ public class QuickstepLauncher extends BaseQuickstepLauncher { 
        }

        if (state == NORMAL && !inTransition) {

            ((RecentsView) getOverviewPanel()).setSwipeDownShouldLaunchApp(false);



            // Close any opened folder

            Folder folder = Folder.getOpen(this);

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

                folder.close(false);

            }

        }

    }

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

+1 −1
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>, 
            }

        }

        AbstractFloatingView.closeAllOpenViewsExcept(activity, mWasLauncherAlreadyVisible,

                AbstractFloatingView.TYPE_LISTENER);

                AbstractFloatingView.TYPE_LISTENER | AbstractFloatingView.TYPE_FOLDER);



        if (mWasLauncherAlreadyVisible) {

            mStateCallback.setState(STATE_LAUNCHER_DRAWN);

src/com/android/launcher3/AbstractFloatingView.java

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch 
    public static final int TYPE_REBIND_SAFE = TYPE_WIDGETS_FULL_SHEET

            | TYPE_WIDGETS_BOTTOM_SHEET | TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE

            | TYPE_ALL_APPS_EDU | TYPE_ICON_SURFACE | TYPE_WIDGETS_EDUCATION_DIALOG

            | TYPE_TASKBAR_EDUCATION_DIALOG;

            | TYPE_TASKBAR_EDUCATION_DIALOG | TYPE_FOLDER;



    // Usually we show the back button when a floating view is open. Instead, hide for these types.

    public static final int TYPE_HIDE_BACK_BUTTON = TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE