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

Commit cd19578b authored by Luca Zuccarini's avatar Luca Zuccarini Committed by Android (Google) Code Review
Browse files

Merge "Only enforce return animations when going to Launcher." into main

parents be0896f3 a4723845
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -702,6 +702,8 @@ constructor(
            object : Controller by controller {
                override val isLaunching: Boolean = false
            }
        // Cross-task close transitions should not use this animation, so we only register it for
        // when the opening window is Launcher.
        val returnFilter =
            TransitionFilter().apply {
                mRequirements =
@@ -710,7 +712,11 @@ constructor(
                            mActivityType = WindowConfiguration.ACTIVITY_TYPE_STANDARD
                            mModes = intArrayOf(TRANSIT_CLOSE, TRANSIT_TO_BACK)
                            mTopActivity = component
                        }
                        },
                        TransitionFilter.Requirement().apply {
                            mActivityType = WindowConfiguration.ACTIVITY_TYPE_HOME
                            mModes = intArrayOf(TRANSIT_OPEN, TRANSIT_TO_FRONT)
                        },
                    )
            }
        val returnRemoteTransition =