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

Commit 61b1dcf5 authored by Luca Zuccarini's avatar Luca Zuccarini
Browse files

Clean up aconfig flag activity_transition_use_largest_window. 

Bug: 397180418
Flag: EXEMPT flag cleanup
Test: EXEMPT flag cleanup
Change-Id: I267e4e3c020bbc574ddf6271f6bbdc537a6ebe1f
parent 19d3ac9c

packages/SystemUI/animation/src/com/android/systemui/animation/ActivityTransitionAnimator.kt

+22 −34
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ import androidx.annotation.UiThread 
import com.android.app.animation.Interpolators

import com.android.internal.annotations.VisibleForTesting

import com.android.internal.policy.ScreenDecorationsUtils

import com.android.systemui.Flags.activityTransitionUseLargestWindow

import com.android.systemui.Flags.animationLibraryDelayLeashCleanup

import com.android.systemui.Flags.moveTransitionAnimationLayer

import com.android.systemui.Flags.translucentOccludingActivityFix
@@ -1370,16 +1369,14 @@ constructor( 


            for (it in apps) {

                if (it.mode == targetMode) {

                    if (activityTransitionUseLargestWindow()) {

                    if (returnAnimationsEnabled()) {

                        // If the controller contains a cookie, _only_ match if either the

                        // candidate contains the matching cookie, or a component is also

                        // defined and is a match.

                        if (

                            controller.transitionCookie != null &&

                                    it.taskInfo

                                        ?.launchCookies

                                        ?.contains(controller.transitionCookie) != true &&

                                it.taskInfo?.launchCookies?.contains(controller.transitionCookie) !=

                                    true &&

                                (controller.component == null ||

                                    it.taskInfo?.topActivity != controller.component)

                        ) {
@@ -1388,8 +1385,7 @@ constructor( 
                    }



                    if (

                            candidate == null ||

                                !it.hasAnimatingParent && candidate.hasAnimatingParent

                        candidate == null || !it.hasAnimatingParent && candidate.hasAnimatingParent

                    ) {

                        candidate = it

                        continue
@@ -1400,14 +1396,6 @@ constructor( 
                    ) {

                        candidate = it

                    }

                    } else {

                        if (!it.hasAnimatingParent) {

                            return it

                        }

                        if (candidate == null) {

                            candidate = it

                        }

                    }

                }

            }