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

Commit ec56afe3 authored by Ben Lin's avatar Ben Lin Committed by Android (Google) Code Review
Browse files

Merge "PiP: Re-attach PiP menu when display changes." into tm-dev

parents 04b94c55 7c64525d

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

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ public class PhonePipMenuController implements PipMenuController { 
        detachPipMenuView();

    }



    private void attachPipMenuView() {

    void attachPipMenuView() {

        // In case detach was not called (e.g. PIP unexpectedly closed)

        if (mPipMenuView != null) {

            detachPipMenuView();

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

+1 −0
Original line number Diff line number Diff line
@@ -521,6 +521,7 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
        };



        if (mPipTaskOrganizer.isInPip() && saveRestoreSnapFraction) {

            mMenuController.attachPipMenuView();

            // Calculate the snap fraction of the current stack along the old movement bounds

            final PipSnapAlgorithm pipSnapAlgorithm = mPipBoundsAlgorithm.getSnapAlgorithm();

            final Rect postChangeStackBounds = new Rect(mPipBoundsState.getBounds());