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

Commit 3c78b0b0 authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Disable cancelling the animation in exitPip" into tm-qpr-dev am: 5d2572c6 

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



Change-Id: Ia5ed2827975f40fb6fb26c13467df380a4992ce0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3574aa57 5d2572c6

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

+2 −1
Original line number Diff line number Diff line
@@ -462,7 +462,8 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
        }



        // Cancel the existing animator if there is any.

        cancelCurrentAnimator();

        // TODO(b/232439933): this is disabled temporarily to unblock b/234502692.

        // cancelCurrentAnimator();



        // Set the exiting state first so if there is fixed rotation later, the running animation

        // won't be interrupted by alpha animation for existing PiP.