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

Commit 48045245 authored by Jerry Chang's avatar Jerry Chang Committed by Android (Google) Code Review
Browse files

Merge "Fix dragging the same app over a split app dismisses the split"

parents 5e84beeb a19699ea
Loading
Loading
Loading
Loading
+10 −7
Original line number Diff line number Diff line
@@ -349,17 +349,20 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
                    RemoteAnimationTarget[] wallpapers, RemoteAnimationTarget[] nonApps,
                    IRemoteAnimationFinishedCallback finishedCallback,
                    SurfaceControl.Transaction t) {
                mStageCoordinator.updateSurfaceBounds(null /* layout */, t);
                if (apps == null || apps.length == 0) {
                    // Do nothing when the animation was cancelled.
                    t.apply();
                    return;
                }

                if (apps != null) {
                mStageCoordinator.updateSurfaceBounds(null /* layout */, t);
                for (int i = 0; i < apps.length; ++i) {
                    if (apps[i].mode == MODE_OPENING) {
                        t.show(apps[i].leash);
                    }
                }
                }

                t.apply();

                if (finishedCallback != null) {
                    try {
                        finishedCallback.onAnimationFinished();