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

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

Merge "Add root task tracking to dev options." into main

parents d061d665 0d1c0243

core/java/android/window/DesktopModeFlags.java

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ public enum DesktopModeFlags { 
    ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS(Flags::enableTaskResizingKeyboardShortcuts, true),

    ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER(

        Flags::enableDesktopWallpaperActivityForSystemUser, true),

    ENABLE_TOP_VISIBLE_ROOT_TASK_PER_USER_TRACKING(

        Flags::enableTopVisibleRootTaskPerUserTracking, true),

    ENABLE_DESKTOP_RECENTS_TRANSITIONS_CORNERS_BUGFIX(

            Flags::enableDesktopRecentsTransitionsCornersBugfix, false),

    ENABLE_DESKTOP_SYSTEM_DIALOGS_TRANSITIONS(Flags::enableDesktopSystemDialogsTransitions, true);

services/core/java/com/android/server/wm/RootWindowContainer.java

+2 −1
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ import android.view.Display; 
import android.view.DisplayInfo;

import android.view.SurfaceControl;

import android.view.WindowManager;

import android.window.DesktopModeFlags;

import android.window.TaskFragmentAnimationParams;

import android.window.WindowContainerToken;
@@ -1908,7 +1909,7 @@ class RootWindowContainer extends WindowContainer<DisplayContent> 
        // appropriate.

        removeRootTasksInWindowingModes(WINDOWING_MODE_PINNED);



        if (Flags.enableTopVisibleRootTaskPerUserTracking()) {

        if (DesktopModeFlags.ENABLE_TOP_VISIBLE_ROOT_TASK_PER_USER_TRACKING.isTrue()) {

            final IntArray visibleRootTasks = new IntArray();

            forAllRootTasks(rootTask -> {

                if ((mCurrentUser == rootTask.mUserId || rootTask.showForAllUsers())