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

Commit e3419a96 authored by Gustav Sennton's avatar Gustav Sennton
Browse files

Use new enableDesktopWindowingEnterTransitions flag 

Enable enter-transitions either when the flag
- enableDesktopWindowingTransitions, or the flag
- enableDesktopWindowingEnterTransitions
is enabled.

Use the DesktopModeFlags field for enableDesktopWindowingEnterTransitions.

Test: n/a
Bug: 369763947
Flag: com.android.window.flags.enable_desktop_windowing_enter_transitions
Change-Id: I7a12c6e6d5c125c4d9739c7cddc2742e11da8b9d
parent 85692fd6

core/java/android/window/DesktopModeFlags.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -64,7 +64,9 @@ 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_TRANSITIONS(Flags::enableDesktopWindowingTransitions, false),

    ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS(Flags::enableDesktopWindowingTransitions, false),

    ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS(Flags::enableDesktopWindowingExitTransitions, 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);

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 




package com.android.wm.shell.dagger;

package com.android.wm.shell.dagger;





import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS;

import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS;

import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS;

import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TASK_LIMIT;

import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_TASK_LIMIT;
@@ -727,7 +728,8 @@ public abstract class WMShellModule { 
            Transitions transitions,

            Transitions transitions,

            RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer,

            RootTaskDisplayAreaOrganizer rootTaskDisplayAreaOrganizer,

            InteractionJankMonitor interactionJankMonitor) {

            InteractionJankMonitor interactionJankMonitor) {

        return Flags.enableDesktopWindowingTransitions()

        return (Flags.enableDesktopWindowingTransitions() ||

            ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS.isTrue())

                ? new SpringDragToDesktopTransitionHandler(context, transitions,

                ? new SpringDragToDesktopTransitionHandler(context, transitions,

                        rootTaskDisplayAreaOrganizer, interactionJankMonitor)

                        rootTaskDisplayAreaOrganizer, interactionJankMonitor)

                : new DefaultDragToDesktopTransitionHandler(context, transitions,

                : new DefaultDragToDesktopTransitionHandler(context, transitions,