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

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

Merge "Don't move stashed PiP in response to keep clear areas changes." into... 

Merge "Don't move stashed PiP in response to keep clear areas changes." into tm-qpr-dev am: 8ae63801

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



Change-Id: I847c9e9f651f6beebd6487688e023ff58ef5ec3b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6838af86 8ae63801

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

+4 −0
Original line number Diff line number Diff line
@@ -161,6 +161,10 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
            // early bail out if the keep clear areas feature is disabled

            return;

        }

        if (mPipBoundsState.isStashed()) {

            // don't move when stashed

            return;

        }

        // if there is another animation ongoing, wait for it to finish and try again

        if (mPipAnimationController.isAnimating()) {

            mMainExecutor.removeCallbacks(