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

Commit 6236c01a authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Prevent duplicate release same transaction from TransactionPool" into... 

Merge "Prevent duplicate release same transaction from TransactionPool" into main am: bdb639ea am: 8ca90fd1

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



Change-Id: Ia8173b995ab0ac2fee9a6e0a0e85f4f9c7fd1399
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 08214cc5 8ca90fd1

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenTransitions.java

+3 −1
Original line number Diff line number Diff line
@@ -479,18 +479,20 @@ class SplitScreenTransitions { 
    private void startFadeAnimation(@NonNull SurfaceControl leash, boolean show) {

        final float end = show ? 1.f : 0.f;

        final float start = 1.f - end;

        final SurfaceControl.Transaction transaction = mTransactionPool.acquire();

        final ValueAnimator va = ValueAnimator.ofFloat(start, end);

        va.setDuration(FADE_DURATION);

        va.setInterpolator(show ? ALPHA_IN : ALPHA_OUT);

        va.addUpdateListener(animation -> {

            float fraction = animation.getAnimatedFraction();

            final SurfaceControl.Transaction transaction = mTransactionPool.acquire();

            transaction.setAlpha(leash, start * (1.f - fraction) + end * fraction);

            transaction.apply();

            mTransactionPool.release(transaction);

        });

        va.addListener(new AnimatorListenerAdapter() {

            @Override

            public void onAnimationEnd(Animator animation) {

                final SurfaceControl.Transaction transaction = mTransactionPool.acquire();

                transaction.setAlpha(leash, end);

                transaction.apply();

                mTransactionPool.release(transaction);