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

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

feat: Don't close opened folder

parent e43e5204

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

+7 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ import com.android.launcher3.apppairs.AppPairIcon; 
import com.android.launcher3.appprediction.PredictionRowView;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.desktop.DesktopRecentsTransitionController;

import com.android.launcher3.folder.Folder;

import com.android.launcher3.hybridhotseat.HotseatPredictionController;

import com.android.launcher3.logging.InstanceId;

import com.android.launcher3.logging.StatsLogManager;
@@ -502,6 +503,12 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer, 
        }

        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
@@ -590,7 +590,7 @@ public abstract class AbsSwipeUpHandler< 
            }

        }

        AbstractFloatingView.closeAllOpenViewsExcept(container, 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
@@ -119,7 +119,7 @@ public abstract class AbstractFloatingView extends LinearLayout implements Touch 
            | TYPE_WIDGETS_BOTTOM_SHEET | TYPE_ON_BOARD_POPUP | TYPE_DISCOVERY_BOUNCE

            | TYPE_ALL_APPS_EDU | TYPE_ICON_SURFACE | TYPE_TASKBAR_EDUCATION_DIALOG

            | TYPE_TASKBAR_ALL_APPS | TYPE_OPTIONS_POPUP_DIALOG | TYPE_TASKBAR_OVERLAY_PROXY

            | TYPE_PIN_IME_POPUP;

            | TYPE_PIN_IME_POPUP | TYPE_FOLDER;



    /** Type of popups that should get exclusive accessibility focus. */

    public static final int TYPE_ACCESSIBLE = TYPE_ALL & ~TYPE_DISCOVERY_BOUNCE & ~TYPE_LISTENER