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

Commit cad25dc1 authored by Mateusz Cicheński's avatar Mateusz Cicheński Committed by Automerger Merge Worker
Browse files

Merge "Fix the regression of PiP position in fixed rotation" into tm-qpr-dev am: d7f99f6c 

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



Change-Id: I9c57b981e69d074ae455d9470f1e94fd6d6c09f2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 888d0b43 d7f99f6c

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

+9 −0
Original line number Original line Diff line number Diff line
@@ -612,12 +612,21 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
                new DisplayInsetsController.OnInsetsChangedListener() {

                new DisplayInsetsController.OnInsetsChangedListener() {

                    @Override

                    @Override

                    public void insetsChanged(InsetsState insetsState) {

                    public void insetsChanged(InsetsState insetsState) {

                        DisplayLayout pendingLayout =

                                mDisplayController.getDisplayLayout(mPipBoundsState.getDisplayId());

                        if (mIsInFixedRotation

                                || pendingLayout.rotation()

                                != mPipBoundsState.getDisplayLayout().rotation()) {

                            // bail out if there is a pending rotation or fixed rotation change

                            return;

                        }

                        int oldMaxMovementBound = mPipBoundsState.getMovementBounds().bottom;

                        int oldMaxMovementBound = mPipBoundsState.getMovementBounds().bottom;

                        onDisplayChanged(

                        onDisplayChanged(

                                mDisplayController.getDisplayLayout(mPipBoundsState.getDisplayId()),

                                mDisplayController.getDisplayLayout(mPipBoundsState.getDisplayId()),

                                false /* saveRestoreSnapFraction */);

                                false /* saveRestoreSnapFraction */);

                        int newMaxMovementBound = mPipBoundsState.getMovementBounds().bottom;

                        int newMaxMovementBound = mPipBoundsState.getMovementBounds().bottom;

                        if (!mEnablePipKeepClearAlgorithm) {

                        if (!mEnablePipKeepClearAlgorithm) {

                            // offset PiP to adjust for bottom inset change

                            int pipTop = mPipBoundsState.getBounds().top;

                            int pipTop = mPipBoundsState.getBounds().top;

                            int diff = newMaxMovementBound - oldMaxMovementBound;

                            int diff = newMaxMovementBound - oldMaxMovementBound;

                            if (diff < 0 && pipTop > newMaxMovementBound) {

                            if (diff < 0 && pipTop > newMaxMovementBound) {