Merge "[Unfold animation] Merge change transitions into unfold transition" into udc-dev am: 7db57f1db8 am: ed8c116288

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23485369

Change-Id: I3e9e27f73b4c915e5020e1f9a87a72c2ee44104e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nick Chameyev
2023-06-01 11:22:35 +00:00
committed by Automerger Merge Worker

View File

@@ -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,