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

Commit f7b51d92 authored by Jorge Gil's avatar Jorge Gil Committed by Automerger Merge Worker
Browse files

Merge "Align PIP menu after rotation" into sc-dev am: 6723b90e 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I856209e45b3652de6d9c7319dbe238ec272e601c
parents 91c6bc53 6723b90e

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

+2 −1
Original line number Diff line number Diff line
@@ -978,7 +978,8 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
        finishResizeForMenu(destinationBounds);

    }



    private void finishResizeForMenu(Rect destinationBounds) {

    /** Moves the PiP menu to the destination bounds. */

    public void finishResizeForMenu(Rect destinationBounds) {

        mPipMenuController.movePipMenu(null, null, destinationBounds);

        mPipMenuController.updateMenuBounds(destinationBounds);

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -552,6 +552,7 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
        // mTouchHandler would rely on the bounds populated from mPipTaskOrganizer

        mPipTaskOrganizer.onMovementBoundsChanged(outBounds, fromRotation, fromImeAdjustment,

                fromShelfAdjustment, wct);

        mPipTaskOrganizer.finishResizeForMenu(outBounds);

        mTouchHandler.onMovementBoundsChanged(mTmpInsetBounds, mPipBoundsState.getNormalBounds(),

                outBounds, fromImeAdjustment, fromShelfAdjustment, rotation);

    }