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

Commit c6290acd authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[dev_option][More flags 4/n] Update all usages of Taskbar-show running... 

Merge "[dev_option][More flags 4/n] Update all usages of Taskbar-show running apps flag to use DesktopModeFlags." into main
parents 7c434ddb a9a5ecf3

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

+3 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 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.enableDesktopWindowingTaskbarRunningApps

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

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

import java.io.PrintWriter
@@ -45,7 +45,8 @@ class TaskbarRecentAppsController( 
) : LoggableTaskbarController {



    var canShowRunningApps =

        DesktopModeStatus.canEnterDesktopMode(context) && enableDesktopWindowingTaskbarRunningApps()

        DesktopModeStatus.canEnterDesktopMode(context) &&

            DesktopModeFlags.TASKBAR_RUNNING_APPS.isEnabled(context)

        @VisibleForTesting

        set(isEnabledFromTest) {

            field = isEnabledFromTest

quickstep/src/com/android/quickstep/SystemUiProxy.java

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR; 
import static com.android.launcher3.util.SplitConfigurationOptions.StagePosition;

import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.RECENT_TASKS_MISSING;

import static com.android.quickstep.util.LogUtils.splitFailureMessage;

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



import android.app.ActivityManager;

import android.app.ActivityOptions;
@@ -95,6 +94,7 @@ import com.android.wm.shell.onehanded.IOneHanded; 
import com.android.wm.shell.recents.IRecentTasks;

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

import com.android.wm.shell.shared.IShellTransitions;

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

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

import com.android.wm.shell.splitscreen.ISplitScreen;

import com.android.wm.shell.splitscreen.ISplitScreenListener;
@@ -1444,7 +1444,7 @@ public class SystemUiProxy implements ISystemUiProxy, NavHandle, SafeCloseable { 


    private boolean shouldEnableRunningTasksForDesktopMode() {

        return DesktopModeStatus.canEnterDesktopMode(mContext)

                && enableDesktopWindowingTaskbarRunningApps();

                && DesktopModeFlags.TASKBAR_RUNNING_APPS.isEnabled(mContext);

    }



    private boolean handleMessageAsync(Message msg) {