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

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

Merge "Use task instead of sourceTask to detect the fullscreen launch" into main

parents 68557edf d438bc2a

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

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ class DesktopModeLaunchParamsModifier implements LaunchParamsModifier { 
            final Task sourceTask = source.getTask();

            // Don't explicitly set to freeform if task is launching in full-screen in desktop-first

            // container, as it should already inherit freeform by default if undefined.

            requestFullscreen |= sourceTask.getWindowingMode() == WINDOWING_MODE_FULLSCREEN;

            requestFullscreen |= task.getWindowingMode() == WINDOWING_MODE_FULLSCREEN;

            isFullscreenInDeskTask = inDesktopFirstContainer && requestFullscreen;

            if (DesktopModeFlags.DISABLE_DESKTOP_LAUNCH_PARAMS_OUTSIDE_DESKTOP_BUG_FIX.isTrue()

                    && isEnteringDesktopMode(sourceTask, options, currentParams)

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

+7 −4
Original line number Diff line number Diff line
@@ -1710,13 +1710,16 @@ public class DesktopModeLaunchParamsModifierTests extends 
    public void testInMultiDesk_requestFullscreen_returnDone() {

        setupDesktopModeLaunchParamsModifier();



        final Task task = new TaskBuilder(mSupervisor).setActivityType(

                ACTIVITY_TYPE_STANDARD).setCreatedByOrganizer(true).build();

        final Task deskRoot = new TaskBuilder(mSupervisor).setActivityType(

                ACTIVITY_TYPE_STANDARD).setWindowingMode(WINDOWING_MODE_FREEFORM)

                .setCreatedByOrganizer(true).build();

        final Task sourceTask = new TaskBuilder(mSupervisor).setActivityType(

                ACTIVITY_TYPE_STANDARD).setWindowingMode(WINDOWING_MODE_FULLSCREEN).build();

        // Creating a fullscreen task under the desk root.

        final Task task = new TaskBuilder(mSupervisor).setActivityType(

                ACTIVITY_TYPE_STANDARD).setWindowingMode(WINDOWING_MODE_FULLSCREEN)

                .setParentTask(deskRoot).build();



        assertNotNull(task.getCreatedByOrganizerTask());

        task.getCreatedByOrganizerTask().setWindowingMode(WINDOWING_MODE_FREEFORM);

        final ActivityRecord sourceActivity = new ActivityBuilder(task.mAtmService)

                .setTask(sourceTask).build();