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

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

Merge "Use bugfix flags for desktop transitions: enter, exit, alttab, applaunch" into main

parents 4256b0d6 90977068

core/java/android/window/DesktopModeFlags.java

+11 −2
Original line number Diff line number Diff line
@@ -68,7 +68,8 @@ public enum DesktopModeFlags { 
            Flags::enableDesktopWindowingTaskbarRunningApps, true),

    // TODO: b/369763947 - remove this once ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS is ramped up

    ENABLE_DESKTOP_WINDOWING_TRANSITIONS(Flags::enableDesktopWindowingTransitions, false),

    ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS(Flags::enableDesktopWindowingTransitions, false),

    ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS(

            Flags::enableDesktopWindowingEnterTransitions, false),

    ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS(Flags::enableDesktopWindowingExitTransitions, false),

    ENABLE_WINDOWING_TRANSITION_HANDLERS_OBSERVERS(

            Flags::enableWindowingTransitionHandlersObservers, false),
@@ -77,7 +78,15 @@ public enum DesktopModeFlags { 
    ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS(

            Flags::enableDesktopAppLaunchTransitions, false),

    ENABLE_DESKTOP_WINDOWING_PERSISTENCE(Flags::enableDesktopWindowingPersistence, false),

    ENABLE_HANDLE_INPUT_FIX(Flags::enableHandleInputFix, true);

    ENABLE_HANDLE_INPUT_FIX(Flags::enableHandleInputFix, true),

    ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS_BUGFIX(

            Flags::enableDesktopWindowingEnterTransitionBugfix, false),

    ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX(

            Flags::enableDesktopWindowingExitTransitionsBugfix, false),

    ENABLE_DESKTOP_APP_LAUNCH_ALTTAB_TRANSITIONS_BUGFIX(

            Flags::enableDesktopAppLaunchAlttabTransitionsBugfix, false),

    ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX(

            Flags::enableDesktopAppLaunchTransitionsBugfix, false);



    private static final String TAG = "DesktopModeFlagsUtil";

    // Function called to obtain aconfig flag value.

libs/WindowManager/Shell/src/com/android/wm/shell/dagger/WMShellModule.java

+3 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.wm.shell.dagger;



import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS;

import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS_BUGFIX;

import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_MODALS_POLICY;

import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TASK_LIMIT;

import static android.window.DesktopModeFlags.ENABLE_WINDOWING_TRANSITION_HANDLERS_OBSERVERS;
@@ -854,7 +855,8 @@ public abstract class WMShellModule { 
            RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer,

            InteractionJankMonitor interactionJankMonitor) {

        return (Flags.enableDesktopWindowingTransitions()

                        || ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS.isTrue())

                        || ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS.isTrue()

                        || ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS_BUGFIX.isTrue())

                ? new SpringDragToDesktopTransitionHandler(

                        context, transitions, rootTaskDisplayAreaOrganizer, interactionJankMonitor)

                : new DefaultDragToDesktopTransitionHandler(

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

+10 −3
Original line number Diff line number Diff line
@@ -78,7 +78,10 @@ class DesktopMixedTransitionHandler( 


    /** Starts close transition and handles or delegates desktop task close animation. */

    override fun startRemoveTransition(wct: WindowContainerTransaction?): IBinder {

        if (!DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS.isTrue) {

        if (

            !DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS.isTrue &&

                !DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX.isTrue

        ) {

            return freeformTaskTransitionHandler.startRemoveTransition(wct)

        }

        requireNotNull(wct)
@@ -102,7 +105,8 @@ class DesktopMixedTransitionHandler( 
    ): IBinder {

        if (

            !Flags.enableFullyImmersiveInDesktop() &&

                !DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS.isTrue

                !DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS.isTrue &&

                !DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX.isTrue

        ) {

            return transitions.startTransition(transitionType, wct, /* handler= */ null)

        }
@@ -250,7 +254,10 @@ class DesktopMixedTransitionHandler( 
            minimizeChange?.taskInfo?.taskId,

            immersiveExitChange?.taskInfo?.taskId,

        )

        if (DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS.isTrue) {

        if (

            DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS.isTrue ||

                DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX.isTrue

        ) {

            // Only apply minimize change reparenting here if we implement the new app launch

            // transitions, otherwise this reparenting is handled in the default handler.

            minimizeChange?.let {

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

+4 −1
Original line number Diff line number Diff line
@@ -1922,7 +1922,10 @@ class DesktopTasksController( 
        launchTaskId: Int,

        minimizeTaskId: Int?,

    ) {

        if (!DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS.isTrue) {

        if (

            !DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS.isTrue &&

                !DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX.isTrue

        ) {

            return

        }

        // TODO b/359523924: pass immersive task here?

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopMixedTransitionHandlerTest.kt

+32 −11
Original line number Diff line number Diff line
@@ -152,7 +152,9 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() { 
    }



    @Test

    @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS)

    @DisableFlags(

        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS,

        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX)

    fun startRemoveTransition_callsFreeformTaskTransitionHandler() {

        val wct = WindowContainerTransaction()

        whenever(freeformTaskTransitionHandler.startRemoveTransition(wct))
@@ -164,7 +166,9 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS)

    @EnableFlags(

        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS,

        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX)

    fun startRemoveTransition_startsCloseTransition() {

        val wct = WindowContainerTransaction()

        whenever(transitions.startTransition(WindowManager.TRANSIT_CLOSE, wct, mixedHandler))
@@ -203,7 +207,9 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS)

    @EnableFlags(

        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS,

        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX)

    fun startAnimation_withClosingDesktopTask_callsCloseTaskHandler() {

        val wct = WindowContainerTransaction()

        val transition = mock<IBinder>()
@@ -231,7 +237,9 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS)

    @EnableFlags(

        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS,

        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX)

    fun startAnimation_withClosingLastDesktopTask_dispatchesTransition() {

        val wct = WindowContainerTransaction()

        val transition = mock<IBinder>()
@@ -272,7 +280,8 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() { 
    @Test

    @DisableFlags(

        Flags.FLAG_ENABLE_FULLY_IMMERSIVE_IN_DESKTOP,

        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS)

        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS,

        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX)

    fun startLaunchTransition_immersiveAndAppLaunchFlagsDisabled_doesNotUseMixedHandler() {

        val wct = WindowContainerTransaction()

        val task = createTask(WINDOWING_MODE_FREEFORM)
@@ -308,7 +317,9 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS)

    @EnableFlags(

        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS,

        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX)

    fun startLaunchTransition_desktopAppLaunchEnabled_usesMixedHandler() {

        val wct = WindowContainerTransaction()

        val task = createTask(WINDOWING_MODE_FREEFORM)
@@ -407,7 +418,9 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS)

    @EnableFlags(

        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS,

        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX)

    fun startAndAnimateLaunchTransition_noMinimizeChange_doesNotReparentMinimizeChange() {

        val wct = WindowContainerTransaction()

        val launchingTask = createTask(WINDOWING_MODE_FREEFORM)
@@ -437,7 +450,9 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS)

    @EnableFlags(

        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS,

        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX)

    fun startAndAnimateLaunchTransition_withMinimizeChange_reparentsMinimizeChange() {

        val wct = WindowContainerTransaction()

        val launchingTask = createTask(WINDOWING_MODE_FREEFORM)
@@ -469,7 +484,9 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS)

    @EnableFlags(

        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS,

        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX)

    fun startAnimation_pendingTransition_noLaunchChange_returnsFalse() {

        val wct = WindowContainerTransaction()

        val launchingTask = createTask(WINDOWING_MODE_FREEFORM)
@@ -566,7 +583,9 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS)

    @EnableFlags(

        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS,

        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX)

    fun addPendingAndAnimateLaunchTransition_noMinimizeChange_doesNotReparentMinimizeChange() {

        val wct = WindowContainerTransaction()

        val launchingTask = createTask(WINDOWING_MODE_FREEFORM)
@@ -598,7 +617,9 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS)

    @EnableFlags(

        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS,

        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX)

    fun addPendingAndAnimateLaunchTransition_withMinimizeChange_reparentsMinimizeChange() {

        val wct = WindowContainerTransaction()

        val launchingTask = createTask(WINDOWING_MODE_FREEFORM)