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

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

Merge "Redirect shelf height requests into keep clear area registration" into... 

Merge "Redirect shelf height requests into keep clear area registration" into udc-qpr-dev am: c24e6e01 am: 1d727e73

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



Change-Id: I051a70e8ed3fe8a06aab55b805955c6b687fe06e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d408fbef 1d727e73

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

+5 −0
Original line number Diff line number Diff line
@@ -939,6 +939,11 @@ public class PipController implements PipTransitionController.PipTransitionCallb 
     * Sets both shelf visibility and its height.

     */

    private void setShelfHeight(boolean visible, int height) {

        if (mEnablePipKeepClearAlgorithm) {

            // turn this into Launcher keep clear area registration instead

            setLauncherKeepClearAreaHeight(visible, height);

            return;

        }

        if (!mIsKeyguardShowingOrAnimating) {

            setShelfHeightLocked(visible, height);

        }