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

Commit 0d1c0243 authored by Orhan Uysal's avatar Orhan Uysal
Browse files

Add root task tracking to dev options. 

Bug: 391626384
Change-Id: I372c8e59df256c2f232bdf7b052375bb3ffcf409
Test: Presubmit
Flag: com.android.window.flags.enable_top_visible_root_task_per_user_tracking
parent 2e22ed1d

core/java/android/window/DesktopModeFlags.java

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

    ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS(Flags::enableTaskResizingKeyboardShortcuts, true),

    ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER(

    ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER(

        Flags::enableDesktopWallpaperActivityForSystemUser, true),

        Flags::enableDesktopWallpaperActivityForSystemUser, true),

    ENABLE_TOP_VISIBLE_ROOT_TASK_PER_USER_TRACKING(

        Flags::enableTopVisibleRootTaskPerUserTracking, true),

    ENABLE_DESKTOP_RECENTS_TRANSITIONS_CORNERS_BUGFIX(

    ENABLE_DESKTOP_RECENTS_TRANSITIONS_CORNERS_BUGFIX(

            Flags::enableDesktopRecentsTransitionsCornersBugfix, false),

            Flags::enableDesktopRecentsTransitionsCornersBugfix, false),

    ENABLE_DESKTOP_SYSTEM_DIALOGS_TRANSITIONS(Flags::enableDesktopSystemDialogsTransitions, true);

    ENABLE_DESKTOP_SYSTEM_DIALOGS_TRANSITIONS(Flags::enableDesktopSystemDialogsTransitions, true);

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

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

import android.view.DisplayInfo;

import android.view.SurfaceControl;

import android.view.SurfaceControl;

import android.view.WindowManager;

import android.view.WindowManager;

import android.window.DesktopModeFlags;

import android.window.TaskFragmentAnimationParams;

import android.window.TaskFragmentAnimationParams;

import android.window.WindowContainerToken;

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

        // appropriate.

        removeRootTasksInWindowingModes(WINDOWING_MODE_PINNED);

        removeRootTasksInWindowingModes(WINDOWING_MODE_PINNED);





        if (Flags.enableTopVisibleRootTaskPerUserTracking()) {

        if (DesktopModeFlags.ENABLE_TOP_VISIBLE_ROOT_TASK_PER_USER_TRACKING.isTrue()) {

            final IntArray visibleRootTasks = new IntArray();

            final IntArray visibleRootTasks = new IntArray();

            forAllRootTasks(rootTask -> {

            forAllRootTasks(rootTask -> {

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

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