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

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

Merge "Fix Maps PiP entrance to not bounce down and up" into udc-dev am: 0a3b6523 

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



Change-Id: I090f7c492768be8757869cccf9194dae6ad12a45
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 65364130 0a3b6523

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

+6 −1
Original line number Diff line number Diff line
@@ -946,10 +946,15 @@ 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);

            // postpone moving in response to hide of Launcher in case there's another change

            mMainExecutor.removeCallbacks(mMovePipInResponseToKeepClearAreasChangeCallback);

            mMainExecutor.executeDelayed(

                    mMovePipInResponseToKeepClearAreasChangeCallback,

                    PIP_KEEP_CLEAR_AREAS_DELAY);

        }

        updatePipPositionForKeepClearAreas();

    }



    private void setLauncherAppIconSize(int iconSizePx) {