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

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

Add dev options overrides for desktop transitions flags. 

Bug: 392089013
Test: n/a
Flag: EXEMPT flag modification
Change-Id: Ia86df03b7e6647284169598c90de82ecdc776441
parent 24109ce0

core/java/android/window/DesktopModeFlags.java

+8 −5
Original line number Diff line number Diff line
@@ -81,20 +81,23 @@ public enum DesktopModeFlags { 
    ENABLE_DESKTOP_WINDOWING_PERSISTENCE(Flags::enableDesktopWindowingPersistence, false),

    ENABLE_HANDLE_INPUT_FIX(Flags::enableHandleInputFix, true),

    ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS_BUGFIX(

            Flags::enableDesktopWindowingEnterTransitionBugfix, false),

            Flags::enableDesktopWindowingEnterTransitionBugfix, true),

    ENABLE_DESKTOP_WINDOWING_EXIT_TRANSITIONS_BUGFIX(

            Flags::enableDesktopWindowingExitTransitionsBugfix, false),

            Flags::enableDesktopWindowingExitTransitionsBugfix, true),

    ENABLE_DESKTOP_APP_LAUNCH_ALTTAB_TRANSITIONS_BUGFIX(

            Flags::enableDesktopAppLaunchAlttabTransitionsBugfix, false),

            Flags::enableDesktopAppLaunchAlttabTransitionsBugfix, true),

    ENABLE_DESKTOP_APP_LAUNCH_TRANSITIONS_BUGFIX(

            Flags::enableDesktopAppLaunchTransitionsBugfix, false),

            Flags::enableDesktopAppLaunchTransitionsBugfix, true),

    INCLUDE_TOP_TRANSPARENT_FULLSCREEN_TASK_IN_DESKTOP_HEURISTIC(

            Flags::includeTopTransparentFullscreenTaskInDesktopHeuristic, true),

    ENABLE_MINIMIZE_BUTTON(Flags::enableMinimizeButton, true),

    ENABLE_RESIZING_METRICS(Flags::enableResizingMetrics, true),

    ENABLE_TASK_RESIZING_KEYBOARD_SHORTCUTS(Flags::enableTaskResizingKeyboardShortcuts, true),

    ENABLE_DESKTOP_WALLPAPER_ACTIVITY_FOR_SYSTEM_USER(

        Flags::enableDesktopWallpaperActivityForSystemUser, true);

        Flags::enableDesktopWallpaperActivityForSystemUser, true),

    ENABLE_DESKTOP_RECENTS_TRANSITIONS_CORNERS_BUGFIX(

            Flags::enableDesktopRecentsTransitionsCornersBugfix, false),

    ENABLE_DESKTOP_SYSTEM_DIALOGS_TRANSITIONS(Flags::enableDesktopSystemDialogsTransitions, true);



    /**

     * Flag class, to be used in case the enum cannot be used because the flag is not accessible.

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

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


package com.android.wm.shell.dagger;



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_MODALS_POLICY;
@@ -1023,7 +1024,7 @@ public abstract class WMShellModule { 
            DesktopModeCompatPolicy desktopModeCompatPolicy) {

        if (!DesktopModeStatus.canEnterDesktopMode(context)

                || !ENABLE_DESKTOP_WINDOWING_MODALS_POLICY.isTrue()

                || !Flags.enableDesktopSystemDialogsTransitions()) {

                || !ENABLE_DESKTOP_SYSTEM_DIALOGS_TRANSITIONS.isTrue()) {

            return Optional.empty();

        }

        return Optional.of(

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java

+1 −1
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel, 
                new DesktopModeOnTaskResizeAnimationListener());

        mDesktopTasksController.setOnTaskRepositionAnimationListener(

                new DesktopModeOnTaskRepositionAnimationListener());

        if (Flags.enableDesktopRecentsTransitionsCornersBugfix()) {

        if (DesktopModeFlags.ENABLE_DESKTOP_RECENTS_TRANSITIONS_CORNERS_BUGFIX.isTrue()) {

            mRecentsTransitionHandler.addTransitionStateListener(

                    new DesktopModeRecentsTransitionStateListener());

        }