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

Commit 7509c1ba authored by Saho Kobayashi's avatar Saho Kobayashi
Browse files

Rename isCloseTransition to a specific name 

Renaming DesktopTasksTransitionObserver#isCloseTransition to
shouldAddPendingTransition.
"isCloseTransition" sounds like it returns true to all close
transitions, but actually it returns false when there are no freeform
window remaining in the display and it exits desktop mode.
Bug: none
Test: m
Flag: EXEMPT refactor

Change-Id: Iacaf0c2be9b7eddc9e5ad32773fa64edb5e6ff74
parent 44fba6c5

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) {