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

Commit 9be5c493 authored by Uwais Ashraf's avatar Uwais Ashraf Committed by Android (Google) Code Review
Browse files

Merge "Switch to using enableUseTopVisibleActivityForExcludeFromRecentTask for... 

Merge "Switch to using enableUseTopVisibleActivityForExcludeFromRecentTask for bugfix of exclude from recents visible activities" into main
parents e897c64c e5e315ae

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

+3 −1
Original line number Diff line number Diff line
@@ -550,7 +550,9 @@ public class RecentTasksController implements TaskStackListenerCallback, 
                groupedTasks.add(GroupedTaskInfo.forSplitTasks(taskInfo, pairedTaskInfo,

                        mTaskSplitBoundsMap.get(pairedTaskId)));

            } else {

                if (Flags.enableRefactorTaskThumbnail() && isWallpaperTask(taskInfo)) {

                if (

                        Flags.enableUseTopVisibleActivityForExcludeFromRecentTask()

                                && isWallpaperTask(taskInfo)) {

                    // Don't add the wallpaper task as an entry in grouped tasks

                    continue;

                }

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/recents/RecentTasksControllerTest.java

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; 
import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;



import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession;

import static com.android.launcher3.Flags.FLAG_ENABLE_REFACTOR_TASK_THUMBNAIL;

import static com.android.launcher3.Flags.FLAG_ENABLE_USE_TOP_VISIBLE_ACTIVITY_FOR_EXCLUDE_FROM_RECENT_TASK;

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

import static com.android.wm.shell.shared.split.SplitScreenConstants.SNAP_TO_2_50_50;
@@ -250,7 +250,7 @@ public class RecentTasksControllerTest extends ShellTestCase { 
                t3.taskId, -1);

    }



    @EnableFlags(FLAG_ENABLE_REFACTOR_TASK_THUMBNAIL)

    @EnableFlags(FLAG_ENABLE_USE_TOP_VISIBLE_ACTIVITY_FOR_EXCLUDE_FROM_RECENT_TASK)

    @Test

    public void testGetRecentTasks_removesDesktopWallpaperActivity() {

        RecentTaskInfo t1 = makeTaskInfo(1);

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

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ import static android.view.WindowManager.LayoutParams.FIRST_APPLICATION_WINDOW; 
import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW;



import static com.android.internal.protolog.WmProtoLogGroups.WM_DEBUG_TASKS;

import static com.android.launcher3.Flags.enableRefactorTaskThumbnail;

import static com.android.launcher3.Flags.enableUseTopVisibleActivityForExcludeFromRecentTask;

import static com.android.server.wm.ActivityRecord.State.RESUMED;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_RECENTS;

import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_RECENTS_TRIM_TASKS;
@@ -1529,7 +1529,7 @@ class RecentTasks { 
                // The Recents is only supported on default display now, we should only keep the

                // most recent task of home display.

                boolean isMostRecentTask;

                if (enableRefactorTaskThumbnail()) {

                if (enableUseTopVisibleActivityForExcludeFromRecentTask()) {

                    isMostRecentTask = task.getTopVisibleActivity() != null;

                } else {

                    isMostRecentTask = taskIndex == 0;

services/tests/wmtests/src/com/android/server/wm/RecentTasksTest.java

+6 −6
Original line number Diff line number Diff line
@@ -717,13 +717,13 @@ public class RecentTasksTest extends WindowTestsBase { 
    }



    @Test

    @DisableFlags(Flags.FLAG_ENABLE_REFACTOR_TASK_THUMBNAIL)

    @DisableFlags(Flags.FLAG_ENABLE_USE_TOP_VISIBLE_ACTIVITY_FOR_EXCLUDE_FROM_RECENT_TASK)

    public void testVisibleTasks_excludedFromRecents() {

        testVisibleTasks_excludedFromRecents_internal();

    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_REFACTOR_TASK_THUMBNAIL)

    @EnableFlags(Flags.FLAG_ENABLE_USE_TOP_VISIBLE_ACTIVITY_FOR_EXCLUDE_FROM_RECENT_TASK)

    public void testVisibleTasks_excludedFromRecents_withRefactorFlag() {

        testVisibleTasks_excludedFromRecents_internal();

    }
@@ -767,13 +767,13 @@ public class RecentTasksTest extends WindowTestsBase { 


    @Test

    @Ignore("b/342627272")

    @DisableFlags(Flags.FLAG_ENABLE_REFACTOR_TASK_THUMBNAIL)

    @DisableFlags(Flags.FLAG_ENABLE_USE_TOP_VISIBLE_ACTIVITY_FOR_EXCLUDE_FROM_RECENT_TASK)

    public void testVisibleTasks_excludedFromRecents_visibleTaskNotFirstTask() {

        testVisibleTasks_excludedFromRecents_visibleTaskNotFirstTask_internal();

    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_REFACTOR_TASK_THUMBNAIL)

    @EnableFlags(Flags.FLAG_ENABLE_USE_TOP_VISIBLE_ACTIVITY_FOR_EXCLUDE_FROM_RECENT_TASK)

    public void testVisibleTasks_excludedFromRecents_visibleTaskNotFirstTask_withRefactorFlag() {

        testVisibleTasks_excludedFromRecents_visibleTaskNotFirstTask_internal();

    }
@@ -816,13 +816,13 @@ public class RecentTasksTest extends WindowTestsBase { 
    }



    @Test

    @DisableFlags(Flags.FLAG_ENABLE_REFACTOR_TASK_THUMBNAIL)

    @DisableFlags(Flags.FLAG_ENABLE_USE_TOP_VISIBLE_ACTIVITY_FOR_EXCLUDE_FROM_RECENT_TASK)

    public void testVisibleTasks_excludedFromRecents_firstTaskNotVisible() {

        testVisibleTasks_excludedFromRecents_firstTaskNotVisible_internal();

    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_REFACTOR_TASK_THUMBNAIL)

    @EnableFlags(Flags.FLAG_ENABLE_USE_TOP_VISIBLE_ACTIVITY_FOR_EXCLUDE_FROM_RECENT_TASK)

    public void testVisibleTasks_excludedFromRecents_firstTaskNotVisible_withRefactorFlag() {

        testVisibleTasks_excludedFromRecents_firstTaskNotVisible_internal();

    }