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

Commit a9f30c2a 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 6c356c54 9b613d6d

libs/WindowManager/Shell/shared/src/com/android/wm/shell/shared/desktopmode/DesktopModeFlags.kt

+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ enum class DesktopModeFlags( 
    DYNAMIC_INITIAL_BOUNDS(Flags::enableWindowingDynamicInitialBounds, true),

    ENABLE_DESKTOP_WINDOWING_TASK_LIMIT(Flags::enableDesktopWindowingTaskLimit, true),

    BACK_NAVIGATION(Flags::enableDesktopWindowingBackNavigation, true),

    EDGE_DRAG_RESIZE(Flags::enableWindowingEdgeDragResize, true);

    EDGE_DRAG_RESIZE(Flags::enableWindowingEdgeDragResize, true),

    TASKBAR_RUNNING_APPS(Flags::enableDesktopWindowingTaskbarRunningApps, true);



    /**

     * Determines state of flag based on the actual flag and desktop mode developer option

libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java

+1 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.wm.shell.recents; 
import static android.app.ActivityTaskManager.INVALID_TASK_ID;

import static android.content.pm.PackageManager.FEATURE_PC;



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

import static com.android.wm.shell.sysui.ShellSharedConstants.KEY_EXTRA_SHELL_RECENT_TASKS;



import android.app.ActivityManager;
@@ -365,7 +364,7 @@ public class RecentTasksController implements TaskStackListenerCallback, 
    private boolean shouldEnableRunningTasksForDesktopMode() {

        return mPcFeatureEnabled

                || (DesktopModeStatus.canEnterDesktopMode(mContext)

                && enableDesktopWindowingTaskbarRunningApps());

                && DesktopModeFlags.TASKBAR_RUNNING_APPS.isEnabled(mContext));

    }



    @VisibleForTesting