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

Commit 9348526c authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Ensure at most one pip-dismiss-overlay" into sc-v2-dev am: de8bc925 

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

Change-Id: I5128ed0c8f224e4b14116aa083db4d5c4f49514c
parents ad82eb4e de8bc925

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

+5 −0
Original line number Diff line number Diff line
@@ -120,6 +120,11 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen 
        mEnableDismissDragToEdge = res.getBoolean(R.bool.config_pipEnableDismissDragToEdge);

        mDismissAreaHeight = res.getDimensionPixelSize(R.dimen.floating_dismiss_gradient_height);



        if (mTargetViewContainer != null) {

            // init can be called multiple times, remove the old one from view hierarchy first.

            mWindowManager.removeViewImmediate(mTargetViewContainer);

        }



        mTargetView = new DismissCircleView(mContext);

        mTargetViewContainer = new FrameLayout(mContext);

        mTargetViewContainer.setBackgroundDrawable(