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

Commit 0cc687d7 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

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



Change-Id: Ia9aa206b843e52bd2cf1eb5fa35a8b7e3626a61f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c47b3c39 156254df

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