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

Commit 442dbd14 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove lingering content overlays in onTaskVanished" into tm-dev

parents 4e42dc05 8a35943e

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

+6 −4
Original line number Diff line number Diff line
@@ -801,11 +801,7 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
                    "%s: Unrecognized token: %s", TAG, token);

            return;

        }

        onExitPipFinished(info);



        if (Transitions.ENABLE_SHELL_TRANSITIONS) {

            mPipTransitionController.forceFinishTransition();

        }

        final PipAnimationController.PipTransitionAnimator<?> animator =

                mPipAnimationController.getCurrentAnimator();

        if (animator != null) {
@@ -817,6 +813,12 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
            animator.removeAllListeners();

            animator.cancel();

        }



        onExitPipFinished(info);



        if (Transitions.ENABLE_SHELL_TRANSITIONS) {

            mPipTransitionController.forceFinishTransition();

        }

    }



    @Override