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

Commit ead11ab1 authored by Orhan Uysal's avatar Orhan Uysal
Browse files

Add enableInorderTransitionCallbacksForDesktop to DesktopExperienceFlags. 

Bug: 421369676
Test: m
Flag: com.android.window.flags.enable_inorder_transition_callbacks_for_desktop
Change-Id: I64329552991d0bf1370469787af19e8ab787b4dd
parent 298437d3

core/java/android/window/DesktopExperienceFlags.java

+3 −0
Original line number Diff line number Diff line
@@ -157,6 +157,9 @@ public enum DesktopExperienceFlags { 
            Flags.FLAG_ENABLE_FULLSCREEN_WINDOW_CONTROLS),

    ENABLE_INDEPENDENT_BACK_IN_PROJECTED(Flags::enableIndependentBackInProjected, true,

            Flags.FLAG_ENABLE_INDEPENDENT_BACK_IN_PROJECTED),

    ENABLE_INORDER_TRANSITION_CALLBACKS_FOR_DESKTOP(

            Flags::enableInorderTransitionCallbacksForDesktop, false,

            Flags.FLAG_ENABLE_INORDER_TRANSITION_CALLBACKS_FOR_DESKTOP),

    ENABLE_KEYBOARD_SHORTCUTS_TO_SWITCH_DESKS(Flags::keyboardShortcutsToSwitchDesks, true,

            Flags.FLAG_KEYBOARD_SHORTCUTS_TO_SWITCH_DESKS),

    ENABLE_MIRROR_DISPLAY_NO_ACTIVITY(Flags::enableMirrorDisplayNoActivity, false,

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

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



import static android.window.DesktopExperienceFlags.ENABLE_WINDOWING_TRANSITION_HANDLERS_OBSERVERS;

import static android.window.DesktopExperienceFlags.ENABLE_INORDER_TRANSITION_CALLBACKS_FOR_DESKTOP;

import static android.window.DesktopModeFlags.ENABLE_DESKTOP_SYSTEM_DIALOGS_TRANSITIONS;

import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_ENTER_TRANSITIONS_BUGFIX;

import static android.window.DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_MODALS_POLICY;
@@ -1048,7 +1049,7 @@ public abstract class WMShellModule { 
            Optional<DesktopImeHandler> desktopImeHandler,

            Optional<DesktopBackNavTransitionObserver> desktopBackNavTransitionObserver,

            DesktopModeLoggerTransitionObserver desktopModeLoggerTransitionObserver) {

        if (enableInorderTransitionCallbacksForDesktop()

        if (ENABLE_INORDER_TRANSITION_CALLBACKS_FOR_DESKTOP.isTrue()

                && ENABLE_WINDOWING_TRANSITION_HANDLERS_OBSERVERS.isTrue()

                && desktopState.canEnterDesktopMode()) {

            return Optional.of(new DesktopInOrderTransitionObserver(

libs/WindowManager/Shell/src/com/android/wm/shell/freeform/FreeformTaskTransitionObserver.java

+4 −4
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ public class FreeformTaskTransitionObserver implements Transitions.TransitionObs 
            @NonNull TransitionInfo info,

            @NonNull SurfaceControl.Transaction startT,

            @NonNull SurfaceControl.Transaction finishT) {

        if (Flags.enableInorderTransitionCallbacksForDesktop()) {

        if (DesktopExperienceFlags.ENABLE_INORDER_TRANSITION_CALLBACKS_FOR_DESKTOP.isTrue()) {

            mDesktopInOrderTransitionObserver.ifPresent(

                    o -> o.onTransitionReady(transition, info, startT, finishT));

        } else {
@@ -287,7 +287,7 @@ public class FreeformTaskTransitionObserver implements Transitions.TransitionObs 


    @Override

    public void onTransitionStarting(@NonNull IBinder transition) {

        if (Flags.enableInorderTransitionCallbacksForDesktop()) {

        if (DesktopExperienceFlags.ENABLE_INORDER_TRANSITION_CALLBACKS_FOR_DESKTOP.isTrue()) {

            mDesktopInOrderTransitionObserver.ifPresent(o -> o.onTransitionStarting(transition));

        } else {

            if (DesktopModeFlags.ENABLE_FULLY_IMMERSIVE_IN_DESKTOP.isTrue()) {
@@ -299,7 +299,7 @@ public class FreeformTaskTransitionObserver implements Transitions.TransitionObs 


    @Override

    public void onTransitionMerged(@NonNull IBinder merged, @NonNull IBinder playing) {

        if (Flags.enableInorderTransitionCallbacksForDesktop()) {

        if (DesktopExperienceFlags.ENABLE_INORDER_TRANSITION_CALLBACKS_FOR_DESKTOP.isTrue()) {

            mDesktopInOrderTransitionObserver.ifPresent(o -> o.onTransitionMerged(merged, playing));

        } else {

            mDesksTransitionObserver.ifPresent(o -> o.onTransitionMerged(merged, playing));
@@ -329,7 +329,7 @@ public class FreeformTaskTransitionObserver implements Transitions.TransitionObs 


    @Override

    public void onTransitionFinished(@NonNull IBinder transition, boolean aborted) {

        if (Flags.enableInorderTransitionCallbacksForDesktop()) {

        if (DesktopExperienceFlags.ENABLE_INORDER_TRANSITION_CALLBACKS_FOR_DESKTOP.isTrue()) {

            mDesktopInOrderTransitionObserver.ifPresent(

                    o -> o.onTransitionFinished(transition, aborted));

        } else {