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

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

Merge "Make PiP move away to not occlude IME when it's too big" into udc-dev am: c1fac95c 

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



Change-Id: I97cb4e32615d4310aff9d2f23a182fe8e1e1fb96
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ad4aa4ec c1fac95c

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

+12 −3
Original line number Original line Diff line number Diff line
@@ -65,9 +65,18 @@ public class PhonePipKeepClearAlgorithm implements PipKeepClearAlgorithmInterfac 
        }

        }

        Rect pipBounds = new Rect(startingBounds);

        Rect pipBounds = new Rect(startingBounds);





        // move PiP towards corner if user hasn't moved it manually or the flag is on

        boolean shouldApplyGravity = false;

        if (mKeepClearAreaGravityEnabled

        // if PiP is outside of screen insets, reposition using gravity

                || (!pipBoundsState.hasUserMovedPip() && !pipBoundsState.hasUserResizedPip())) {

        if (!insets.contains(pipBounds)) {

            shouldApplyGravity = true;

        }

        // if user has not interacted with PiP, reposition using gravity

        if (!pipBoundsState.hasUserMovedPip() && !pipBoundsState.hasUserResizedPip()) {

            shouldApplyGravity = true;

        }



        // apply gravity that will position PiP in bottom left or bottom right corner within insets

        if (mKeepClearAreaGravityEnabled || shouldApplyGravity) {

            float snapFraction = pipBoundsAlgorithm.getSnapFraction(startingBounds);

            float snapFraction = pipBoundsAlgorithm.getSnapFraction(startingBounds);

            int verticalGravity = Gravity.BOTTOM;

            int verticalGravity = Gravity.BOTTOM;

            int horizontalGravity;

            int horizontalGravity;