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

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

Merge "Don't move PiP if keyguard is showing or animating." into tm-qpr-dev am: de264b42 

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



Change-Id: I079a58d1da83fc91fe0848e31b815dfc6d44ee4e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 68e6e4ff de264b42

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

+12 −2
Original line number Diff line number Diff line
@@ -161,6 +161,10 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
            this::onKeepClearAreasChangedCallback;



    private void onKeepClearAreasChangedCallback() {

        if (mIsKeyguardShowingOrAnimating) {

            // early bail out if the change was caused by keyguard showing up

            return;

        }

        if (!mEnablePipKeepClearAlgorithm) {

            // early bail out if the keep clear areas feature is disabled

            return;
@@ -186,6 +190,10 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
            // early bail out if the keep clear areas feature is disabled

            return;

        }

        if (mIsKeyguardShowingOrAnimating) {

            // early bail out if the change was caused by keyguard showing up

            return;

        }

        // only move if we're in PiP or transitioning into PiP

        if (!mPipTransitionState.shouldBlockResizeRequest()) {

            Rect destBounds = mPipKeepClearAlgorithm.adjust(mPipBoundsState,
@@ -635,9 +643,11 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
                        DisplayLayout pendingLayout =

                                mDisplayController.getDisplayLayout(mPipBoundsState.getDisplayId());

                        if (mIsInFixedRotation

                                || mIsKeyguardShowingOrAnimating

                                || pendingLayout.rotation()

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

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

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

                            // there's a keyguard present

                            return;

                        }

                        int oldMaxMovementBound = mPipBoundsState.getMovementBounds().bottom;
@@ -931,10 +941,10 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
                    mPipBoundsState.getDisplayBounds().right,

                    mPipBoundsState.getDisplayBounds().bottom);

            mPipBoundsState.addNamedUnrestrictedKeepClearArea(LAUNCHER_KEEP_CLEAR_AREA_TAG, rect);

            updatePipPositionForKeepClearAreas();

        } else {

            mPipBoundsState.removeNamedUnrestrictedKeepClearArea(LAUNCHER_KEEP_CLEAR_AREA_TAG);

        }

        updatePipPositionForKeepClearAreas();

    }



    private void setLauncherAppIconSize(int iconSizePx) {