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

Commit 00614eae authored by Alina Zaidi's avatar Alina Zaidi
Browse files

Use DesktopModeStatus#canEnterDesktopMode instead of just Flag check. 

Test: Existing tests pass
Bug: 349544589
Flag: EXEMPT minor refactoring
Change-Id: Idf572d48d35b8eeedd7fd1b8c608834d27a818e7
parent f35cb427

quickstep/src/com/android/launcher3/taskbar/TaskbarRecentAppsController.kt

+2 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import com.android.quickstep.RecentsModel 
import com.android.quickstep.util.DesktopTask

import com.android.quickstep.util.GroupTask

import com.android.window.flags.Flags.enableDesktopWindowingTaskbarRunningApps

import com.android.wm.shell.shared.desktopmode.DesktopModeFlags.DESKTOP_WINDOWING_MODE

import com.android.wm.shell.shared.desktopmode.DesktopModeStatus

import java.io.PrintWriter



/**
@@ -44,9 +44,8 @@ class TaskbarRecentAppsController( 
    private val desktopVisibilityControllerProvider: () -> DesktopVisibilityController?,

) : LoggableTaskbarController {



    // TODO(b/335401172): unify DesktopMode checks in Launcher.

    var canShowRunningApps =

        DESKTOP_WINDOWING_MODE.isEnabled(context) && enableDesktopWindowingTaskbarRunningApps()

        DesktopModeStatus.canEnterDesktopMode(context) && enableDesktopWindowingTaskbarRunningApps()

        @VisibleForTesting

        set(isEnabledFromTest) {

            field = isEnabledFromTest

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

+3 −3
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ import static com.android.quickstep.util.SplitAnimationTimings.TABLET_HOME_TO_SP 
import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.WALLPAPER_ACTIVITY;

import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_HOME_KEY;

import static com.android.wm.shell.common.split.SplitScreenConstants.SNAP_TO_50_50;

import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.DESKTOP_WINDOWING_MODE;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;
@@ -200,6 +199,7 @@ import com.android.systemui.unfold.config.UnfoldTransitionConfig; 
import com.android.systemui.unfold.dagger.UnfoldMain;

import com.android.systemui.unfold.progress.RemoteUnfoldTransitionReceiver;

import com.android.systemui.unfold.updates.RotationChangeProvider;

import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;



import kotlin.Unit;
@@ -280,7 +280,7 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer 
        // TODO(b/337863494): Explore use of the same OverviewComponentObserver across launcher

        OverviewComponentObserver overviewComponentObserver = new OverviewComponentObserver(

                asContext(), deviceState);

        if (DESKTOP_WINDOWING_MODE.isEnabled(this)) {

        if (DesktopModeStatus.canEnterDesktopMode(this)) {

            mDesktopRecentsTransitionController = new DesktopRecentsTransitionController(

                    getStateManager(), systemUiProxy, getIApplicationThread(),

                    getDepthController());
@@ -300,7 +300,7 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer 


        mTISBindHelper = new TISBindHelper(this, this::onTISConnected);

        mDepthController = new DepthController(this);

        if (DESKTOP_WINDOWING_MODE.isEnabled(this)) {

        if (DesktopModeStatus.canEnterDesktopMode(this)) {

            mDesktopVisibilityController = new DesktopVisibilityController(this);

            mDesktopVisibilityController.registerSystemUiListener();

            mSplitSelectStateController.initSplitFromDesktopController(this,

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

+4 −4
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent 
import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.ON_SETTLED_ON_END_TARGET;

import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;

import static com.android.systemui.shared.system.ActivityManagerWrapper.CLOSE_SYSTEM_WINDOWS_REASON_RECENTS;

import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.DESKTOP_WINDOWING_MODE;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;
@@ -151,6 +150,7 @@ import com.android.systemui.shared.system.TaskStackChangeListener; 
import com.android.systemui.shared.system.TaskStackChangeListeners;

import com.android.wm.shell.common.TransactionPool;

import com.android.wm.shell.shared.desktopmode.DesktopModeFlags;

import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;

import com.android.wm.shell.startingsurface.SplashScreenExitAnimationUtils;



import kotlin.Unit;
@@ -1273,7 +1273,7 @@ public abstract class AbsSwipeUpHandler<T extends RecentsViewContainer, 
        TaskView currentPageTaskView = mRecentsView != null

                ? mRecentsView.getCurrentPageTaskView() : null;



        if (DESKTOP_WINDOWING_MODE.isEnabled(mContext)

        if (DesktopModeStatus.canEnterDesktopMode(mContext)

                && !(DesktopModeFlags.WALLPAPER_ACTIVITY.isEnabled(mContext)

                && DesktopModeFlags.QUICK_SWITCH.isEnabled(mContext))) {

            if ((nextPageTaskView instanceof DesktopTaskView
@@ -1446,7 +1446,7 @@ public abstract class AbsSwipeUpHandler<T extends RecentsViewContainer, 
            setClampScrollOffset(false);

        };



        if (DESKTOP_WINDOWING_MODE.isEnabled(mContext)

        if (DesktopModeStatus.canEnterDesktopMode(mContext)

                && !(DesktopModeFlags.WALLPAPER_ACTIVITY.isEnabled(mContext)

                && DesktopModeFlags.QUICK_SWITCH.isEnabled(mContext))) {

            if (mRecentsView != null && (mRecentsView.getCurrentPageTaskView() != null
@@ -2294,7 +2294,7 @@ public abstract class AbsSwipeUpHandler<T extends RecentsViewContainer, 
                    mRecentsAnimationController, mRecentsAnimationTargets);

        });



        if (DESKTOP_WINDOWING_MODE.isEnabled(mContext)

        if (DesktopModeStatus.canEnterDesktopMode(mContext)

                && !(DesktopModeFlags.WALLPAPER_ACTIVITY.isEnabled(mContext)

                        && DesktopModeFlags.QUICK_SWITCH.isEnabled(mContext))) {

            if (mRecentsView.getNextPageTaskView() instanceof DesktopTaskView

quickstep/src/com/android/quickstep/RecentTasksList.java

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS; 


import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;

import static com.android.quickstep.util.SplitScreenUtils.convertShellSplitBoundsToLauncher;

import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.DESKTOP_WINDOWING_MODE;

import static com.android.wm.shell.util.GroupedRecentTaskInfo.TYPE_FREEFORM;



import android.app.ActivityManager;
@@ -41,6 +40,7 @@ import com.android.quickstep.util.DesktopTask; 
import com.android.quickstep.util.GroupTask;

import com.android.systemui.shared.recents.model.Task;

import com.android.wm.shell.recents.IRecentTasksListener;

import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;

import com.android.wm.shell.util.GroupedRecentTaskInfo;



import java.io.PrintWriter;
@@ -329,9 +329,9 @@ public class RecentTasksList { 
        int numVisibleTasks = 0;

        for (GroupedRecentTaskInfo rawTask : rawTasks) {

            if (rawTask.getType() == TYPE_FREEFORM) {

                // TYPE_FREEFORM tasks is only created whenDESKTOP_WINDOWING_MODE.isEnabled is true,

                // TYPE_FREEFORM tasks is only created when desktop mode can be entered,

                // leftover TYPE_FREEFORM tasks created when flag was on should be ignored.

                if (DESKTOP_WINDOWING_MODE.isEnabled(mContext)) {

                if (DesktopModeStatus.canEnterDesktopMode(mContext)) {

                    GroupTask desktopTask = createDesktopTask(rawTask);

                    if (desktopTask != null) {

                        allTasks.add(desktopTask);

quickstep/src/com/android/quickstep/RecentsActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import static com.android.launcher3.testing.shared.TestProtocol.OVERVIEW_STATE_O 
import static com.android.quickstep.OverviewComponentObserver.startHomeIntentSafely;

import static com.android.quickstep.TaskUtils.taskIsATargetWithMode;

import static com.android.quickstep.TaskViewUtils.createRecentsWindowAnimator;

import static com.android.wm.shell.shared.desktopmode.DesktopModeFlags.DESKTOP_WINDOWING_MODE;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;
@@ -88,6 +87,7 @@ import com.android.quickstep.views.OverviewActionsView; 
import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.RecentsViewContainer;

import com.android.quickstep.views.TaskView;

import com.android.wm.shell.shared.desktopmode.DesktopModeStatus;



import java.io.FileDescriptor;

import java.io.PrintWriter;
@@ -148,7 +148,7 @@ public final class RecentsActivity extends StatefulActivity<RecentsState> implem 
        mFallbackRecentsView = rootView.findViewById(R.id.overview_panel);

        mActionsView = rootView.findViewById(R.id.overview_actions_view);



        if (DESKTOP_WINDOWING_MODE.isEnabled(this)) {

        if (DesktopModeStatus.canEnterDesktopMode(this)) {

            mDesktopRecentsTransitionController = new DesktopRecentsTransitionController(

                    getStateManager(), systemUiProxy, getIApplicationThread(),

                    null /* depthController */