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

Commit 4913fc9e authored by Gustav Sennton's avatar Gustav Sennton Committed by Android (Google) Code Review
Browse files

Merge "Allow more than two transitions per track" into main

parents 4bc04f8e 59b38006

services/core/java/com/android/server/wm/TransitionController.java

+3 −2
Original line number Diff line number Diff line
@@ -1284,13 +1284,14 @@ class TransitionController { 
            // ignore ourself obviously

            if (mPlayingTransitions.get(i) == transition) continue;

            if (getIsIndependent(mPlayingTransitions.get(i), transition)) continue;

            if (track >= 0) {

            if (track < 0) {

                track = mPlayingTransitions.get(i).mAnimationTrack;

            } else if (track != mPlayingTransitions.get(i).mAnimationTrack) {

                // At this point, transition overlaps with multiple tracks, so just wait for

                // everything

                sync = true;

                break;

            }

            track = mPlayingTransitions.get(i).mAnimationTrack;

        }

        if (sync) {

            track = 0;