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

Commit e00059c5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "PiP: Fully disable dismiss target." into sc-v2-dev am: aff5acf7 am: 52c4adb5 

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

Change-Id: I4088bd6b9442489ec0f638fcd274adc28921bdaa
parents 712d03a4 52c4adb5

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);