Merge "[Unfold animation] Merge change transitions into unfold transition" into udc-dev am: 7db57f1db8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23485369 Change-Id: If818506c5a772ab82133f1b87eb66e3e5e53581b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -173,6 +173,17 @@ public class UnfoldTransitionHandler implements TransitionHandler, UnfoldListene
|
|||||||
mTransition = null;
|
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
|
@Nullable
|
||||||
@Override
|
@Override
|
||||||
public WindowContainerTransaction handleRequest(@NonNull IBinder transition,
|
public WindowContainerTransaction handleRequest(@NonNull IBinder transition,
|
||||||
|
|||||||
Reference in New Issue
Block a user