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

Commit 46ec4b06 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Skip operation on content overlay if task's vanished" into sc-dev am: 5cac66cb 

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

Change-Id: Ibb65f7dbd658399a311534d6d1325c2b0c2cbaf5
parents ebd15877 5cac66cb

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java

+18 −5
Original line number Diff line number Diff line
@@ -1384,11 +1384,20 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
        final ValueAnimator animator = ValueAnimator.ofFloat(1.0f, 0.0f);

        animator.setDuration(mCrossFadeAnimationDuration);

        animator.addUpdateListener(animation -> {

            if (mState == State.UNDEFINED) {

                // Could happen if onTaskVanished happens during the animation since we may have

                // set a start delay on this animation.

                Log.d(TAG, "Task vanished, skip fadeOutAndRemoveOverlay");

                animation.removeAllListeners();

                animation.removeAllUpdateListeners();

                animation.cancel();

            } else {

                final float alpha = (float) animation.getAnimatedValue();

                final SurfaceControl.Transaction transaction =

                        mSurfaceControlTransactionFactory.getTransaction();

                transaction.setAlpha(surface, alpha);

                transaction.apply();

            }

        });

        animator.addListener(new AnimatorListenerAdapter() {

            @Override
@@ -1401,6 +1410,10 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
    }



    private void removeContentOverlay(SurfaceControl surface, Runnable callback) {

        if (mState == State.UNDEFINED) {

            // Avoid double removal, which is fatal.

            return;

        }

        final SurfaceControl.Transaction tx =

                mSurfaceControlTransactionFactory.getTransaction();

        tx.remove(surface);