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

Commit f202aae8 authored by Saho Kobayashi's avatar Saho Kobayashi Committed by Android (Google) Code Review
Browse files

Merge "Rename isCloseTransition to a specific name" into main

parents 2ff89c06 7509c1ba

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

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ class DesktopTasksTransitionObserver( 
        if (

            DesktopExperienceFlags.ENABLE_DESKTOP_CLOSE_TASK_ANIMATION_IN_DTC_BUGFIX.isTrue &&

                !desktopMixedTransitionHandler.hasTransition(transition) &&

                isCloseTransition(info)

                containsClosingTaskInDesktop(info)

        ) {

            desktopMixedTransitionHandler.addPendingMixedTransition(

                DesktopMixedTransitionHandler.PendingMixedTransition.Close(transition)
@@ -101,7 +101,7 @@ class DesktopTasksTransitionObserver( 
        removeWallpaperOnLastTaskClosingIfNeeded(transition, info)

    }



    private fun isCloseTransition(info: TransitionInfo): Boolean {

    private fun containsClosingTaskInDesktop(info: TransitionInfo): Boolean {

        for (change in info.changes) {

            val taskInfo = change.taskInfo

            if (taskInfo == null || taskInfo.taskId == -1) {