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

Commit 1acbb75a authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Do not offset PiP when auto-enter-pip is ongoing" into tm-dev am: d05dbf68 am: 2d38f8a1 

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



Change-Id: Ieef63a992603ea1952fb145e867dbfc471a3ea3a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cd464c7f 2d38f8a1

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

+2 −1
Original line number Diff line number Diff line
@@ -1292,7 +1292,8 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, 
     */

    public void scheduleOffsetPip(Rect originalBounds, int offset, int duration,

            Consumer<Rect> updateBoundsCallback) {

        if (mPipTransitionState.shouldBlockResizeRequest()) {

        if (mPipTransitionState.shouldBlockResizeRequest()

                || mPipTransitionState.getInSwipePipToHomeTransition()) {

            return;

        }

        if (mWaitForFixedRotation) {