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

Commit 3835f932 authored by Alina Zaidi's avatar Alina Zaidi
Browse files

[Dev options][DW flag] Update all usage of enable_desktop_windowing_mode flag... 

[Dev options][DW flag] Update all usage of enable_desktop_windowing_mode flag to use DesktopModeFlags

Test: Current tests pass
Bug: 348193756
Flag: com.android.window.flags.show_desktop_windowing_dev_option
Change-Id: I96107f7c2964ee8261ad0a161163491d6f7d4d39
parent f3256e5b

quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java

+1 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
                new TaskbarTranslationController(this),

                new TaskbarSpringOnStashController(this),

                new TaskbarRecentAppsController(

                        this,

                        RecentsModel.INSTANCE.get(this),

                        LauncherActivityInterface.INSTANCE::getDesktopVisibilityController),

                TaskbarEduTooltipController.newInstance(this),

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

+4 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package com.android.launcher3.taskbar



import android.content.Context

import androidx.annotation.VisibleForTesting

import com.android.launcher3.Flags.enableRecentsInTaskbar

import com.android.launcher3.model.data.ItemInfo
@@ -26,8 +27,8 @@ import com.android.launcher3.util.CancellableTask 
import com.android.quickstep.RecentsModel

import com.android.quickstep.util.DesktopTask

import com.android.quickstep.util.GroupTask

import com.android.window.flags.Flags.enableDesktopWindowingMode

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

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

import java.io.PrintWriter



/**
@@ -36,6 +37,7 @@ import java.io.PrintWriter 
 * - When in Desktop Mode: show the currently running (open) Tasks

 */

class TaskbarRecentAppsController(

    context: Context,

    private val recentsModel: RecentsModel,

    // Pass a provider here instead of the actual DesktopVisibilityController instance since that

    // instance might not be available when this constructor is called.
@@ -44,7 +46,7 @@ class TaskbarRecentAppsController( 


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

    var canShowRunningApps =

        enableDesktopWindowingMode() && enableDesktopWindowingTaskbarRunningApps()

        DESKTOP_WINDOWING_MODE.isEnabled(context) && enableDesktopWindowingTaskbarRunningApps()

        @VisibleForTesting

        set(isEnabledFromTest) {

            field = isEnabledFromTest

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

+5 −5
Original line number Diff line number Diff line
@@ -65,9 +65,9 @@ import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent 
import static com.android.quickstep.util.AnimUtils.completeRunnableListCallback;

import static com.android.quickstep.util.SplitAnimationTimings.TABLET_HOME_TO_SPLIT;

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

import static com.android.window.flags.Flags.enableDesktopWindowingMode;

import static com.android.window.flags.Flags.enableDesktopWindowingWallpaperActivity;

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;
@@ -201,6 +201,8 @@ import com.android.systemui.unfold.dagger.UnfoldMain; 
import com.android.systemui.unfold.progress.RemoteUnfoldTransitionReceiver;

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



import kotlin.Unit;



import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.ArrayList;
@@ -213,8 +215,6 @@ import java.util.function.BiConsumer; 
import java.util.function.Predicate;

import java.util.stream.Stream;



import kotlin.Unit;



public class QuickstepLauncher extends Launcher implements RecentsViewContainer {

    private static final boolean TRACE_LAYOUTS =

            SystemProperties.getBoolean("persist.debug.trace_layouts", false);
@@ -276,7 +276,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 (enableDesktopWindowingMode()) {

        if (DESKTOP_WINDOWING_MODE.isEnabled(this)) {

            mDesktopRecentsTransitionController = new DesktopRecentsTransitionController(

                    getStateManager(), systemUiProxy, getIApplicationThread(),

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


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

        mDepthController = new DepthController(this);

        if (enableDesktopWindowingMode()) {

        if (DESKTOP_WINDOWING_MODE.isEnabled(this)) {

            mDesktopVisibilityController = new DesktopVisibilityController(this);

            mDesktopVisibilityController.registerSystemUiListener();

            mSplitSelectStateController.initSplitFromDesktopController(this,

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

+7 −6
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ 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;
@@ -152,6 +153,8 @@ import com.android.window.flags.Flags; 
import com.android.wm.shell.common.TransactionPool;

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



import kotlin.Unit;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.HashMap;
@@ -161,8 +164,6 @@ import java.util.Optional; 
import java.util.OptionalInt;

import java.util.function.Consumer;



import kotlin.Unit;



/**

 * Handles the navigation gestures when Launcher is the default home activity.

 */
@@ -952,7 +953,7 @@ public abstract class AbsSwipeUpHandler<T extends RecentsViewContainer, 
    public void onRecentsAnimationStart(RecentsAnimationController controller,

            RecentsAnimationTargets targets) {

        super.onRecentsAnimationStart(controller, targets);

        if (targets.hasDesktopTasks()) {

        if (targets.hasDesktopTasks(mContext)) {

            mRemoteTargetHandles = mTargetGluer.assignTargetsForDesktop(targets);

        } else {

            int untrimmedAppCount = mRemoteTargetHandles.length;
@@ -1272,7 +1273,7 @@ public abstract class AbsSwipeUpHandler<T extends RecentsViewContainer, 
        TaskView currentPageTaskView = mRecentsView != null

                ? mRecentsView.getCurrentPageTaskView() : null;



        if (Flags.enableDesktopWindowingMode()

        if (DESKTOP_WINDOWING_MODE.isEnabled(mContext)

                && !(Flags.enableDesktopWindowingWallpaperActivity()

                && Flags.enableDesktopWindowingQuickSwitch())) {

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

        };



        if (Flags.enableDesktopWindowingMode()

        if (DESKTOP_WINDOWING_MODE.isEnabled(mContext)

                && !(Flags.enableDesktopWindowingWallpaperActivity()

                && Flags.enableDesktopWindowingQuickSwitch())) {

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

        });



        if (Flags.enableDesktopWindowingMode()

        if (DESKTOP_WINDOWING_MODE.isEnabled(mContext)

                && !(Flags.enableDesktopWindowingWallpaperActivity()

                        && Flags.enableDesktopWindowingQuickSwitch())) {

            if (mRecentsView.getNextPageTaskView() instanceof DesktopTaskView

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

+9 −5
Original line number Diff line number Diff line
@@ -20,13 +20,14 @@ 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.window.flags.Flags.enableDesktopWindowingMode;

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;

import android.app.KeyguardManager;

import android.app.TaskInfo;

import android.content.ComponentName;

import android.content.Context;

import android.os.Process;

import android.os.RemoteException;

import android.util.SparseBooleanArray;
@@ -58,6 +59,7 @@ public class RecentTasksList { 


    private static final TaskLoadResult INVALID_RESULT = new TaskLoadResult(-1, false, 0);



    private final Context mContext;

    private final KeyguardManager mKeyguardManager;

    private final LooperExecutor mMainThreadExecutor;

    private final SystemUiProxy mSysUiProxy;
@@ -76,8 +78,10 @@ public class RecentTasksList { 
    // Tasks are stored in order of least recently launched to most recently launched.

    private ArrayList<ActivityManager.RunningTaskInfo> mRunningTasks;



    public RecentTasksList(LooperExecutor mainThreadExecutor, KeyguardManager keyguardManager,

            SystemUiProxy sysUiProxy, TopTaskTracker topTaskTracker) {

    public RecentTasksList(Context context, LooperExecutor mainThreadExecutor,

            KeyguardManager keyguardManager, SystemUiProxy sysUiProxy,

            TopTaskTracker topTaskTracker) {

        mContext = context;

        mMainThreadExecutor = mainThreadExecutor;

        mKeyguardManager = keyguardManager;

        mChangeId = 1;
@@ -325,9 +329,9 @@ public class RecentTasksList { 
        int numVisibleTasks = 0;

        for (GroupedRecentTaskInfo rawTask : rawTasks) {

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

                // TYPE_FREEFORM tasks is only created when enableDesktopWindowingMode() is true,

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

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

                if (enableDesktopWindowingMode()) {

                if (DESKTOP_WINDOWING_MODE.isEnabled(mContext)) {

                    GroupTask desktopTask = createDesktopTask(rawTask);

                    if (desktopTask != null) {

                        allTasks.add(desktopTask);