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

Commit c485ab3a authored by Yuichiro Hanada's avatar Yuichiro Hanada Committed by Android (Google) Code Review
Browse files

Merge "Rename DesktopBackNavigationTransitionHandler to... 

Merge "Rename DesktopBackNavigationTransitionHandler to DesktopMinimizationTransitionHandler" into main
parents f3a93f2c ea80a6f6

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

+5 −5
Original line number Diff line number Diff line
@@ -81,9 +81,9 @@ import com.android.wm.shell.dagger.pip.PipModule; 
import com.android.wm.shell.desktopmode.CloseDesktopTaskTransitionHandler;

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

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

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

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

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

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

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

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

import com.android.wm.shell.desktopmode.DesktopModeEventLogger;
@@ -1073,11 +1073,11 @@ public abstract class WMShellModule { 


    @WMSingleton

    @Provides

    static DesktopBackNavigationTransitionHandler provideDesktopBackNavigationTransitionHandler(

    static DesktopMinimizationTransitionHandler provideDesktopMinimizationTransitionHandler(

            @ShellMainThread ShellExecutor mainExecutor,

            @ShellAnimationThread ShellExecutor animExecutor,

            DisplayController displayController) {

        return new DesktopBackNavigationTransitionHandler(mainExecutor, animExecutor,

        return new DesktopMinimizationTransitionHandler(mainExecutor, animExecutor,

                displayController);

    }
@@ -1173,7 +1173,7 @@ public abstract class WMShellModule { 
            FreeformTaskTransitionHandler freeformTaskTransitionHandler,

            CloseDesktopTaskTransitionHandler closeDesktopTaskTransitionHandler,

            Optional<DesktopImmersiveController> desktopImmersiveController,

            DesktopBackNavigationTransitionHandler desktopBackNavigationTransitionHandler,

            DesktopMinimizationTransitionHandler desktopMinimizationTransitionHandler,

            InteractionJankMonitor interactionJankMonitor,

            @ShellMainThread Handler handler,

            ShellInit shellInit,
@@ -1191,7 +1191,7 @@ public abstract class WMShellModule { 
                        freeformTaskTransitionHandler,

                        closeDesktopTaskTransitionHandler,

                        desktopImmersiveController.get(),

                        desktopBackNavigationTransitionHandler,

                        desktopMinimizationTransitionHandler,

                        interactionJankMonitor,

                        handler,

                        shellInit,

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopBackNavigationTransitionHandler.kt→libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopMinimizationTransitionHandler.kt

+6 −3
Original line number Diff line number Diff line
@@ -31,10 +31,13 @@ import com.android.wm.shell.shared.animation.MinimizeAnimator.create 
import com.android.wm.shell.transition.Transitions



/**

 * The [Transitions.TransitionHandler] that handles transitions for tasks that are closing or going

 * to back as part of back navigation. This handler is used only for animating transitions.

 * The [Transitions.TransitionHandler] that handles transitions for tasks that are:

 * - Closing or going to back as part of back navigation

 * - Going to back as part of minimization button usage.

 *

 * Note that this handler is used only for animating transitions.

 */

class DesktopBackNavigationTransitionHandler(

class DesktopMinimizationTransitionHandler(

    private val mainExecutor: ShellExecutor,

    private val animExecutor: ShellExecutor,

    private val displayController: DisplayController,

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

+3 −3
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ class DesktopMixedTransitionHandler( 
    private val freeformTaskTransitionHandler: FreeformTaskTransitionHandler,

    private val closeDesktopTaskTransitionHandler: CloseDesktopTaskTransitionHandler,

    private val desktopImmersiveController: DesktopImmersiveController,

    private val desktopBackNavigationTransitionHandler: DesktopBackNavigationTransitionHandler,

    private val desktopMinimizationTransitionHandler: DesktopMinimizationTransitionHandler,

    private val interactionJankMonitor: InteractionJankMonitor,

    @ShellMainThread private val handler: Handler,

    shellInit: ShellInit,
@@ -316,8 +316,8 @@ class DesktopMixedTransitionHandler( 
            )

        }



        // Animate minimizing desktop task transition with [DesktopBackNavigationTransitionHandler].

        return desktopBackNavigationTransitionHandler.startAnimation(

        // Animate minimizing desktop task transition with [DesktopMinimizationTransitionHandler].

        return desktopMinimizationTransitionHandler.startAnimation(

            transition,

            info,

            startTransaction,

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopBackNavigationTransitionHandlerTest.kt→libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopMinimizationTransitionHandlerTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -45,18 +45,18 @@ import org.mockito.kotlin.whenever 
@SmallTest

@RunWithLooper

@RunWith(AndroidTestingRunner::class)

class DesktopBackNavigationTransitionHandlerTest : ShellTestCase() {

class DesktopMinimizationTransitionHandlerTest : ShellTestCase() {



    private val testExecutor = mock<ShellExecutor>()

    private val closingTaskLeash = mock<SurfaceControl>()

    private val displayController = mock<DisplayController>()



    private lateinit var handler: DesktopBackNavigationTransitionHandler

    private lateinit var handler: DesktopMinimizationTransitionHandler



    @Before

    fun setUp() {

        handler =

            DesktopBackNavigationTransitionHandler(testExecutor, testExecutor, displayController)

            DesktopMinimizationTransitionHandler(testExecutor, testExecutor, displayController)

        whenever(displayController.getDisplayContext(any())).thenReturn(mContext)

    }

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

+6 −7
Original line number Diff line number Diff line
@@ -84,8 +84,7 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() { 
    @Mock lateinit var userRepositories: DesktopUserRepositories

    @Mock lateinit var freeformTaskTransitionHandler: FreeformTaskTransitionHandler

    @Mock lateinit var closeDesktopTaskTransitionHandler: CloseDesktopTaskTransitionHandler

    @Mock

    lateinit var desktopBackNavigationTransitionHandler: DesktopBackNavigationTransitionHandler

    @Mock lateinit var desktopMinimizationTransitionHandler: DesktopMinimizationTransitionHandler

    @Mock lateinit var desktopImmersiveController: DesktopImmersiveController

    @Mock lateinit var interactionJankMonitor: InteractionJankMonitor

    @Mock lateinit var mockHandler: Handler
@@ -108,7 +107,7 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() { 
                freeformTaskTransitionHandler,

                closeDesktopTaskTransitionHandler,

                desktopImmersiveController,

                desktopBackNavigationTransitionHandler,

                desktopMinimizationTransitionHandler,

                interactionJankMonitor,

                mockHandler,

                shellInit,
@@ -642,12 +641,12 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() { 


    @Test

    @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION)

    fun startAnimation_withMinimizingDesktopTask_callsBackNavigationHandler() {

    fun startAnimation_withMinimizingDesktopTask_callsMinimizationHandler() {

        val minimizingTask = createTask(WINDOWING_MODE_FREEFORM)

        val transition = Binder()

        whenever(desktopRepository.getExpandedTaskCount(any())).thenReturn(2)

        whenever(

                desktopBackNavigationTransitionHandler.startAnimation(

                desktopMinimizationTransitionHandler.startAnimation(

                    any(),

                    any(),

                    any(),
@@ -675,7 +674,7 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() { 
            )



        assertTrue("Should delegate animation to back navigation transition handler", started)

        verify(desktopBackNavigationTransitionHandler)

        verify(desktopMinimizationTransitionHandler)

            .startAnimation(

                eq(transition),

                argThat { info -> info.changes.contains(minimizingTaskChange) },
@@ -692,7 +691,7 @@ class DesktopMixedTransitionHandlerTest : ShellTestCase() { 
        val transition = Binder()

        whenever(desktopRepository.getExpandedTaskCount(any())).thenReturn(2)

        whenever(

                desktopBackNavigationTransitionHandler.startAnimation(

                desktopMinimizationTransitionHandler.startAnimation(

                    any(),

                    any(),

                    any(),