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

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

Merge branch '000-t-fixes' into 'v1-t' 

Revert "feat: Use seperate activity for recents"

See merge request e/os/BlissLauncher3!29
parents 4b96d859 32c1ca08

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

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

        }

        AbstractFloatingView.closeAllOpenViewsExcept(activity, mWasLauncherAlreadyVisible,

                AbstractFloatingView.TYPE_LISTENER | AbstractFloatingView.TYPE_FOLDER);

                AbstractFloatingView.TYPE_LISTENER);



        if (mWasLauncherAlreadyVisible) {

            mStateCallback.setState(STATE_LAUNCHER_DRAWN);

src/com/android/launcher3/AbstractFloatingView.java

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,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_WIDGETS_EDUCATION_DIALOG

            | TYPE_TASKBAR_EDUCATION_DIALOG | TYPE_TASKBAR_ALL_APPS | TYPE_OPTIONS_POPUP_DIALOG

            | TYPE_TASKBAR_OVERLAY_PROXY | TYPE_FOLDER;

            | TYPE_TASKBAR_OVERLAY_PROXY;



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

            & ~TYPE_ALL_APPS_EDU;

src/com/android/launcher3/Launcher.java

+1 −4
Original line number Diff line number Diff line
@@ -1757,11 +1757,8 @@ public class Launcher extends StatefulActivity<LauncherState> 
        if (isActionMain) {

            mAppMonitor.onReceiveHomeIntent();

            if (!internalStateHandled) {

                Folder openFolder = Folder.getOpen(this);

                // In all these cases, only animate if we're already on home

                if (openFolder != null && alreadyOnHome) {

                closeOpenViews(isStarted());

                }



                if (!isInState(NORMAL)) {

                    // Only change state, if not already the same. This prevents cancelling any

src/com/android/launcher3/config/FeatureFlags.java

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ public final class FeatureFlags { 
                    "Always use hardware optimization for folder animations.");



    public static final BooleanFlag SEPARATE_RECENTS_ACTIVITY = getDebugFlag(270392980,

            "SEPARATE_RECENTS_ACTIVITY", true,

            "SEPARATE_RECENTS_ACTIVITY", false,

            "Uses a separate recents activity instead of using the integrated recents+Launcher UI");



    public static final BooleanFlag ENABLE_MINIMAL_DEVICE = getDebugFlag(270392984,

src/com/android/launcher3/statemanager/StatefulActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ public abstract class StatefulActivity<STATE_TYPE extends BaseState<STATE_TYPE>> 
        }



        if (state.hasFlag(FLAG_CLOSE_POPUPS)) {

            AbstractFloatingView.closeAllOpenViewsExcept(this, !state.hasFlag(FLAG_NON_INTERACTIVE), AbstractFloatingView.TYPE_FOLDER);

            AbstractFloatingView.closeAllOpenViews(this, !state.hasFlag(FLAG_NON_INTERACTIVE));

        }

    }