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

Commit 2d5c8046 authored by Ikram Gabiyev's avatar Ikram Gabiyev Committed by Automerger Merge Worker
Browse files

Merge "Avoid fullscreen bounds check while exiting pip" into udc-dev am: 7f3ff219 am: 150077cc 

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



Change-Id: Iafeb14b3708f25d791fbf6f0f1015ec0163f97f7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7d7e3a4f 150077cc

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

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

        mFinishCallback = (wct, wctCB) -> {

            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.setBounds(pipTaskToken, null);

                mPipOrganizer.applyWindowingModeChangeOnExit(wct, TRANSITION_DIRECTION_LEAVE_PIP);