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

Commit d447f88c authored by Nick Chameyev's avatar Nick Chameyev Committed by Automerger Merge Worker
Browse files

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

Merge "[Unfold animation] Merge change transitions into unfold transition" into udc-dev am: 7db57f1d am: 4687fe6f

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



Change-Id: I518cb3d9464a2efc245f270869778fd7238c1e23
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 61270d23 4687fe6f

libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldTransitionHandler.java

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