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

Commit 8e4b48e4 authored by Graciela Putri's avatar Graciela Putri Committed by Android (Google) Code Review
Browse files

Merge "[6/n] Add onTransitionFinished callback in DesktopModeLogger" into main

parents bede1943 0fc802e2

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

+1 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ class DesktopInOrderTransitionObserver( 
                h.onTransitionFinished(transition, aborted)

            }

        }

        desktopModeLoggerTransitionObserver.onTransitionFinished(transition, aborted)

    }



    private fun logD(msg: String, vararg arguments: Any?) {

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

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.window.WindowContainerToken; 
import androidx.annotation.NonNull;

import androidx.annotation.VisibleForTesting;



import com.android.window.flags.Flags;

import com.android.wm.shell.desktopmode.DesktopBackNavTransitionObserver;

import com.android.wm.shell.desktopmode.DesktopImeHandler;

import com.android.wm.shell.desktopmode.DesktopImmersiveController;
@@ -339,6 +338,7 @@ public class FreeformTaskTransitionObserver implements Transitions.TransitionObs 
                mDesktopImmersiveController.ifPresent(

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

            }

            mDesktopModeLoggerTransitionObserver.onTransitionFinished(transition, aborted);

        }



        final List<ActivityManager.RunningTaskInfo> taskInfo =

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

+16 −0
Original line number Diff line number Diff line
@@ -172,4 +172,20 @@ class DesktopInOrderTransitionObserverTest : ShellTestCase() { 
            .verify(desktopModeLoggerTransitionObserver)

            .onTransitionReady(transition, info, startT, finishT)

    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_INORDER_TRANSITION_CALLBACKS_FOR_DESKTOP)

    fun onTransitionFinished_forwardsToDesktopModeLoggerTransitionObserver() {

        val transition = Mockito.mock(IBinder::class.java)

        val aborted = false



        val inorder = inOrder(desktopModeLoggerTransitionObserver, desksTransitionObserver)



        transitionObserver.onTransitionFinished(transition, aborted)



        inorder.verify(desksTransitionObserver).onTransitionFinished(transition)

        inorder

            .verify(desktopModeLoggerTransitionObserver)

            .onTransitionFinished(transition, aborted)

    }

}

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/freeform/FreeformTaskTransitionObserverTest.java

+11 −0
Original line number Diff line number Diff line
@@ -510,6 +510,17 @@ public class FreeformTaskTransitionObserverTest extends ShellTestCase { 
                finishT);

    }



    @Test

    @DisableFlags(Flags.FLAG_ENABLE_INORDER_TRANSITION_CALLBACKS_FOR_DESKTOP)

    public void onTransitionFinished_forwardsToDesktopModeLoggerTransitionObserver() {

        final IBinder transition = mock(IBinder.class);

        final boolean aborted = false;



        mTransitionObserver.onTransitionFinished(transition, aborted);



        verify(mDesktopModeLoggerTransitionObserver).onTransitionFinished(transition, aborted);

    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_INORDER_TRANSITION_CALLBACKS_FOR_DESKTOP)

    public void onTransitionReady_forwardsToDesktopInOrderTransitionObserver() {