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

Commit a490e750 authored by Mateusz Cicheński's avatar Mateusz Cicheński Committed by Android (Google) Code Review
Browse files

Merge "Make sure PiP appears on screen when folding the device" into tm-qpr-dev

parents cef1e329 de507114

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

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ public class PipAnimationController { 
    /**

     * Quietly cancel the animator by removing the listeners first.

     */

    static void quietCancel(@NonNull ValueAnimator animator) {

    public static void quietCancel(@NonNull ValueAnimator animator) {

        animator.removeAllUpdateListeners();

        animator.removeAllListeners();

        animator.cancel();

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

+6 −0
Original line number Diff line number Diff line
@@ -715,6 +715,12 @@ public class PipController implements PipTransitionController.PipTransitionCallb 


    private void onDisplayChanged(DisplayLayout layout, boolean saveRestoreSnapFraction) {

        if (!mPipBoundsState.getDisplayLayout().isSameGeometry(layout)) {

            PipAnimationController.PipTransitionAnimator animator =

                    mPipAnimationController.getCurrentAnimator();

            if (animator != null && animator.isRunning()) {

                // cancel any running animator, as it is using stale display layout information

                PipAnimationController.quietCancel(animator);

            }

            onDisplayChangedUncheck(layout, saveRestoreSnapFraction);

        }

    }