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

Commit 6eadcbda authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Remove lingering content overlays in onTaskVanished" into tm-dev am: 442dbd14 am: 156254df am: 0958d65c am: b6feb553

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



Change-Id: Id224ae53844365476df4c2f78b51c9417125f134
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b7745701 b6feb553

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

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

                    "%s: Unrecognized token: %s", TAG, token);

            return;

            return;

        }

        }

        onExitPipFinished(info);





        if (Transitions.ENABLE_SHELL_TRANSITIONS) {

            mPipTransitionController.forceFinishTransition();

        }

        final PipAnimationController.PipTransitionAnimator<?> animator =

        final PipAnimationController.PipTransitionAnimator<?> animator =

                mPipAnimationController.getCurrentAnimator();

                mPipAnimationController.getCurrentAnimator();

        if (animator != null) {

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

            animator.removeAllListeners();

            animator.cancel();

            animator.cancel();

        }

        }



        onExitPipFinished(info);



        if (Transitions.ENABLE_SHELL_TRANSITIONS) {

            mPipTransitionController.forceFinishTransition();

        }

    }

    }





    @Override

    @Override