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

Commit 7f3ff219 authored by Ikram Gabiyev's avatar Ikram Gabiyev Committed by Android (Google) Code Review
Browse files

Merge "Avoid fullscreen bounds check while exiting pip" into udc-dev

parents bdee1f23 96712e6b

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

+10 −1
Original line number Original line Diff line number Diff line
@@ -567,7 +567,16 @@ public class PipTransition extends PipTransitionController { 
                mPipBoundsState.getDisplayBounds());

                mPipBoundsState.getDisplayBounds());

        mFinishCallback = (wct, wctCB) -> {

        mFinishCallback = (wct, wctCB) -> {

            mPipOrganizer.onExitPipFinished(taskInfo);

            mPipOrganizer.onExitPipFinished(taskInfo);

            if (!Transitions.SHELL_TRANSITIONS_ROTATION && toFullscreen) {



            // TODO(b/286346098): remove the OPEN app flicker completely

            // not checking if we go to fullscreen helps avoid getting pip into an inconsistent

            // state after the flicker occurs. This is a temp solution until flicker is removed.

            if (!Transitions.SHELL_TRANSITIONS_ROTATION) {

                // will help to debug the case when we are not exiting to fullscreen

                if (!toFullscreen) {

                    ProtoLog.d(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,

                            "%s: startExitAnimation() not exiting to fullscreen", TAG);

                }

                wct = wct != null ? wct : new WindowContainerTransaction();

                wct = wct != null ? wct : new WindowContainerTransaction();

                wct.setBounds(pipTaskToken, null);

                wct.setBounds(pipTaskToken, null);

                mPipOrganizer.applyWindowingModeChangeOnExit(wct, TRANSITION_DIRECTION_LEAVE_PIP);

                mPipOrganizer.applyWindowingModeChangeOnExit(wct, TRANSITION_DIRECTION_LEAVE_PIP);