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

Commit 6c772b8b authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "[Unfold animation] Merge change transitions into unfold...

Merge "Merge "[Unfold animation] Merge change transitions into unfold transition" into udc-dev am: 7db57f1d am: ed8c1162" into udc-d1-dev-plus-aosp
parents 75cc5d53 614a6d31
Loading
Loading
Loading
Loading
+11 −0
Original line number Diff line number Diff line
@@ -173,6 +173,17 @@ public class UnfoldTransitionHandler implements TransitionHandler, UnfoldListene
        mTransition = null;
    }

    @Override
    public void mergeAnimation(@NonNull IBinder transition, @NonNull TransitionInfo info,
            @NonNull SurfaceControl.Transaction t, @NonNull IBinder mergeTarget,
            @NonNull TransitionFinishCallback finishCallback) {
        if (info.getType() == TRANSIT_CHANGE) {
            // Apply changes happening during the unfold animation immediately
            t.apply();
            finishCallback.onTransitionFinished(null, null);
        }
    }

    @Nullable
    @Override
    public WindowContainerTransaction handleRequest(@NonNull IBinder transition,