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

Commit b829d18b authored by Ben Lin's avatar Ben Lin
Browse files

PiP: Fully disable dismiss target. 

When the flag is not enabled, we should not run any code even in
onReleaseInTarget.

Bug: 177038582
Test: None
Change-Id: Iebf12d4405e462411aacfd4a3f38e566abafb858
parent 37bac532

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

+10 −8
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen 


            @Override

            public void onReleasedInTarget(@NonNull MagnetizedObject.MagneticTarget target) {

                if (mEnableDismissDragToEdge) {

                    mMainExecutor.executeDelayed(() -> {

                        mMotionHelper.notifyDismissalPending();

                        mMotionHelper.animateDismiss();
@@ -167,6 +168,7 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen 
                                PipUiEventLogger.PipUiEventEnum.PICTURE_IN_PICTURE_DRAG_TO_REMOVE);

                    }, 0);

                }

            }

        });



        mMagneticTargetAnimator = PhysicsAnimator.getInstance(mTargetView);