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

Commit 1cba4f09 authored by Gustav Sennton's avatar Gustav Sennton
Browse files

Remove references to old Desktop transitions flags

Remove usages of old enter/exit/app-launch flags.

Bug: 369763947
Test: n/a
Flag: EXEMPT flag modification
Change-Id: Ie0d711ae27c6ac1c1ece8ad5e9c6d5b2e57d68c9
parent ee4c3765
Loading
Loading
Loading
Loading
+0 −9
Original line number Original line Diff line number Diff line
@@ -67,17 +67,8 @@ public enum DesktopModeFlags {
    ENABLE_WINDOWING_EDGE_DRAG_RESIZE(Flags::enableWindowingEdgeDragResize, true),
    ENABLE_WINDOWING_EDGE_DRAG_RESIZE(Flags::enableWindowingEdgeDragResize, true),
    ENABLE_DESKTOP_WINDOWING_TASKBAR_RUNNING_APPS(
    ENABLE_DESKTOP_WINDOWING_TASKBAR_RUNNING_APPS(
            Flags::enableDesktopWindowingTaskbarRunningApps, true),
            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::enableDesktopWindowingEnterTransitions, false),
    ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS(Flags::enableDesktopWindowingExitTransitions, false),
    ENABLE_WINDOWING_TRANSITION_HANDLERS_OBSERVERS(
    ENABLE_WINDOWING_TRANSITION_HANDLERS_OBSERVERS(
            Flags::enableWindowingTransitionHandlersObservers, false),
            Flags::enableWindowingTransitionHandlersObservers, false),
    ENABLE_DESKTOP_APP_LAUNCH_ALTTAB_TRANSITIONS(
            Flags::enableDesktopAppLaunchAlttabTransitions, false),
    ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS(
            Flags::enableDesktopAppLaunchTransitions, false),
    ENABLE_DESKTOP_WINDOWING_PERSISTENCE(Flags::enableDesktopWindowingPersistence, 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(
    ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS_BUGFIX(
+1 −4
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@
package com.android.wm.shell.dagger;
package com.android.wm.shell.dagger;


import static android.window.DesktopModeFlags.ENABLE_DESKTOP_SYSTEM_DIALOGS_TRANSITIONS;
import static android.window.DesktopModeFlags.ENABLE_DESKTOP_SYSTEM_DIALOGS_TRANSITIONS;
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_ENTER_TRANSITIONS_BUGFIX;
import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_MODALS_POLICY;
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_DESKTOP_WINDOWING_TASK_LIMIT;
@@ -912,9 +911,7 @@ public abstract class WMShellModule {
            Transitions transitions,
            Transitions transitions,
            RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer,
            RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer,
            InteractionJankMonitor interactionJankMonitor) {
            InteractionJankMonitor interactionJankMonitor) {
        return (Flags.enableDesktopWindowingTransitions()
        return ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS_BUGFIX.isTrue()
                        || ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS.isTrue()
                        || ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS_BUGFIX.isTrue())
                ? new SpringDragToDesktopTransitionHandler(
                ? new SpringDragToDesktopTransitionHandler(
                        context, transitions, rootTaskDisplayAreaOrganizer, interactionJankMonitor)
                        context, transitions, rootTaskDisplayAreaOrganizer, interactionJankMonitor)
                : new DefaultDragToDesktopTransitionHandler(
                : new DefaultDragToDesktopTransitionHandler(
+2 −9
Original line number Original line Diff line number Diff line
@@ -83,10 +83,7 @@ class DesktopMixedTransitionHandler(


    /** Starts close transition and handles or delegates desktop task close animation. */
    /** Starts close transition and handles or delegates desktop task close animation. */
    override fun startRemoveTransition(wct: WindowContainerTransaction?): IBinder {
    override fun startRemoveTransition(wct: WindowContainerTransaction?): IBinder {
        if (
        if (!DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX.isTrue) {
            !DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS.isTrue &&
                !DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX.isTrue
        ) {
            return freeformTaskTransitionHandler.startRemoveTransition(wct)
            return freeformTaskTransitionHandler.startRemoveTransition(wct)
        }
        }
        requireNotNull(wct)
        requireNotNull(wct)
@@ -110,7 +107,6 @@ class DesktopMixedTransitionHandler(
    ): IBinder {
    ): IBinder {
        if (
        if (
            !Flags.enableFullyImmersiveInDesktop() &&
            !Flags.enableFullyImmersiveInDesktop() &&
                !DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS.isTrue &&
                !DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX.isTrue
                !DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX.isTrue
        ) {
        ) {
            return transitions.startTransition(transitionType, wct, /* handler= */ null)
            return transitions.startTransition(transitionType, wct, /* handler= */ null)
@@ -259,10 +255,7 @@ class DesktopMixedTransitionHandler(
            minimizeChange?.taskInfo?.taskId,
            minimizeChange?.taskInfo?.taskId,
            immersiveExitChange?.taskInfo?.taskId,
            immersiveExitChange?.taskInfo?.taskId,
        )
        )
        if (
        if (DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX.isTrue) {
            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
            // Only apply minimize change reparenting here if we implement the new app launch
            // transitions, otherwise this reparenting is handled in the default handler.
            // transitions, otherwise this reparenting is handled in the default handler.
            minimizeChange?.let {
            minimizeChange?.let {
+1 −4
Original line number Original line Diff line number Diff line
@@ -2346,10 +2346,7 @@ class DesktopTasksController(
        launchTaskId: Int,
        launchTaskId: Int,
        minimizeTaskId: Int?,
        minimizeTaskId: Int?,
    ) {
    ) {
        if (
        if (!DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX.isTrue) {
            !DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS.isTrue &&
                !DesktopModeFlags.ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX.isTrue
        ) {
            return
            return
        }
        }
        // TODO b/359523924: pass immersive task here?
        // TODO b/359523924: pass immersive task here?
+10 −41
Original line number Original line Diff line number Diff line
@@ -143,10 +143,7 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() {
    }
    }


    @Test
    @Test
    @DisableFlags(
    @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX)
        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS,
        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX,
    )
    fun startRemoveTransition_callsFreeformTaskTransitionHandler() {
    fun startRemoveTransition_callsFreeformTaskTransitionHandler() {
        val wct = WindowContainerTransaction()
        val wct = WindowContainerTransaction()
        whenever(freeformTaskTransitionHandler.startRemoveTransition(wct)).thenReturn(mock())
        whenever(freeformTaskTransitionHandler.startRemoveTransition(wct)).thenReturn(mock())
@@ -157,10 +154,7 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() {
    }
    }


    @Test
    @Test
    @EnableFlags(
    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX)
        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS,
        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX,
    )
    fun startRemoveTransition_startsCloseTransition() {
    fun startRemoveTransition_startsCloseTransition() {
        val wct = WindowContainerTransaction()
        val wct = WindowContainerTransaction()
        whenever(transitions.startTransition(WindowManager.TRANSIT_CLOSE, wct, mixedHandler))
        whenever(transitions.startTransition(WindowManager.TRANSIT_CLOSE, wct, mixedHandler))
@@ -200,10 +194,7 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() {
    }
    }


    @Test
    @Test
    @EnableFlags(
    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX)
        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS,
        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX,
    )
    fun startAnimation_withClosingDesktopTask_callsCloseTaskHandler() {
    fun startAnimation_withClosingDesktopTask_callsCloseTaskHandler() {
        val wct = WindowContainerTransaction()
        val wct = WindowContainerTransaction()
        val transition = mock<IBinder>()
        val transition = mock<IBinder>()
@@ -231,10 +222,7 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() {
    }
    }


    @Test
    @Test
    @EnableFlags(
    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX)
        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS,
        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX,
    )
    fun startAnimation_withClosingLastDesktopTask_dispatchesTransition() {
    fun startAnimation_withClosingLastDesktopTask_dispatchesTransition() {
        val wct = WindowContainerTransaction()
        val wct = WindowContainerTransaction()
        val transition = mock<IBinder>()
        val transition = mock<IBinder>()
@@ -278,7 +266,6 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() {
    @Test
    @Test
    @DisableFlags(
    @DisableFlags(
        Flags.FLAG_ENABLE_FULLY_IMMERSIVE_IN_DESKTOP,
        Flags.FLAG_ENABLE_FULLY_IMMERSIVE_IN_DESKTOP,
        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS,
        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX,
        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX,
    )
    )
    fun startLaunchTransition_immersiveAndAppLaunchFlagsDisabled_doesNotUseMixedHandler() {
    fun startLaunchTransition_immersiveAndAppLaunchFlagsDisabled_doesNotUseMixedHandler() {
@@ -316,10 +303,7 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() {
    }
    }


    @Test
    @Test
    @EnableFlags(
    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX)
        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS,
        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX,
    )
    fun startLaunchTransition_desktopAppLaunchEnabled_usesMixedHandler() {
    fun startLaunchTransition_desktopAppLaunchEnabled_usesMixedHandler() {
        val wct = WindowContainerTransaction()
        val wct = WindowContainerTransaction()
        val task = createTask(WINDOWING_MODE_FREEFORM)
        val task = createTask(WINDOWING_MODE_FREEFORM)
@@ -415,10 +399,7 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() {
    }
    }


    @Test
    @Test
    @EnableFlags(
    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX)
        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS,
        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX,
    )
    fun startAndAnimateLaunchTransition_noMinimizeChange_doesNotReparentMinimizeChange() {
    fun startAndAnimateLaunchTransition_noMinimizeChange_doesNotReparentMinimizeChange() {
        val wct = WindowContainerTransaction()
        val wct = WindowContainerTransaction()
        val launchingTask = createTask(WINDOWING_MODE_FREEFORM)
        val launchingTask = createTask(WINDOWING_MODE_FREEFORM)
@@ -444,10 +425,7 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() {
    }
    }


    @Test
    @Test
    @EnableFlags(
    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX)
        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS,
        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX,
    )
    fun startAndAnimateLaunchTransition_withMinimizeChange_reparentsMinimizeChange() {
    fun startAndAnimateLaunchTransition_withMinimizeChange_reparentsMinimizeChange() {
        val wct = WindowContainerTransaction()
        val wct = WindowContainerTransaction()
        val launchingTask = createTask(WINDOWING_MODE_FREEFORM)
        val launchingTask = createTask(WINDOWING_MODE_FREEFORM)
@@ -476,10 +454,7 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() {
    }
    }


    @Test
    @Test
    @EnableFlags(
    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX)
        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS,
        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX,
    )
    fun startAnimation_pendingTransition_noLaunchChange_returnsFalse() {
    fun startAnimation_pendingTransition_noLaunchChange_returnsFalse() {
        val wct = WindowContainerTransaction()
        val wct = WindowContainerTransaction()
        val launchingTask = createTask(WINDOWING_MODE_FREEFORM)
        val launchingTask = createTask(WINDOWING_MODE_FREEFORM)
@@ -569,10 +544,7 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() {
    }
    }


    @Test
    @Test
    @EnableFlags(
    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX)
        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS,
        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX,
    )
    fun addPendingAndAnimateLaunchTransition_noMinimizeChange_doesNotReparentMinimizeChange() {
    fun addPendingAndAnimateLaunchTransition_noMinimizeChange_doesNotReparentMinimizeChange() {
        val wct = WindowContainerTransaction()
        val wct = WindowContainerTransaction()
        val launchingTask = createTask(WINDOWING_MODE_FREEFORM)
        val launchingTask = createTask(WINDOWING_MODE_FREEFORM)
@@ -600,10 +572,7 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() {
    }
    }


    @Test
    @Test
    @EnableFlags(
    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX)
        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS,
        Flags.FLAG_ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX,
    )
    fun addPendingAndAnimateLaunchTransition_withMinimizeChange_reparentsMinimizeChange() {
    fun addPendingAndAnimateLaunchTransition_withMinimizeChange_reparentsMinimizeChange() {
        val wct = WindowContainerTransaction()
        val wct = WindowContainerTransaction()
        val launchingTask = createTask(WINDOWING_MODE_FREEFORM)
        val launchingTask = createTask(WINDOWING_MODE_FREEFORM)
Loading