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

Commit 26fbcb00 authored by Ikram Gabiyev's avatar Ikram Gabiyev
Browse files

[PiP2] Only save reentry state on expand 

We should not be saving reentry state on
remove PiP or dismiss PiP. The latter creates
the issue where PiP snap fraction puts it
in the center of the display at the bottom.

Bug: 381017000
Flag: com.android.wm.shell.enable_pip2
Test: Drag to dismiss, enter app, go to PiP
Change-Id: Ie9de88c39f8a199e8aa2e4e7eee6d8d30415dd8c
parent 6a149ac1

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

+6 −5
Original line number Diff line number Diff line
@@ -627,6 +627,12 @@ public class PipTransition extends PipTransitionController implements 
            finishTransition();

        });

        cacheAndStartTransitionAnimator(animator);



        // Save the PiP bounds in case, we re-enter the PiP with the same component.

        float snapFraction = mPipBoundsAlgorithm.getSnapFraction(

                mPipBoundsState.getBounds());

        mPipBoundsState.saveReentryState(snapFraction);



        return true;

    }
@@ -912,11 +918,6 @@ public class PipTransition extends PipTransitionController implements 
                        "Unexpected bundle for " + mPipTransitionState);

                break;

            case PipTransitionState.EXITED_PIP:

                // Save the PiP bounds in case, we re-enter the PiP with the same component.

                float snapFraction = mPipBoundsAlgorithm.getSnapFraction(

                        mPipBoundsState.getBounds());

                mPipBoundsState.saveReentryState(snapFraction);



                mPipTransitionState.setPinnedTaskLeash(null);

                mPipTransitionState.setPipTaskInfo(null);

                break;