Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "PiP: Fully disable dismiss target." into sc-v2-dev am: aff5acf765

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

Change-Id: I42609cde00a2d5743d4df38db7abb5fa0d653c9e
This commit is contained in:
TreeHugger Robot
2021-07-22 19:40:37 +00:00
committed by Automerger Merge Worker
parent 5f9942df32 aff5acf765
commit 52c4adb516
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,6 +158,7 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen
@Override @Override
public void onReleasedInTarget(@NonNull MagnetizedObject.MagneticTarget target) { public void onReleasedInTarget(@NonNull MagnetizedObject.MagneticTarget target) {
if (mEnableDismissDragToEdge) {
mMainExecutor.executeDelayed(() -> { mMainExecutor.executeDelayed(() -> {
mMotionHelper.notifyDismissalPending(); mMotionHelper.notifyDismissalPending();
mMotionHelper.animateDismiss(); mMotionHelper.animateDismiss();
@@ -167,6 +168,7 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen
PipUiEventLogger.PipUiEventEnum.PICTURE_IN_PICTURE_DRAG_TO_REMOVE); PipUiEventLogger.PipUiEventEnum.PICTURE_IN_PICTURE_DRAG_TO_REMOVE);
}, 0); }, 0);
} }
}
}); });
mMagneticTargetAnimator = PhysicsAnimator.getInstance(mTargetView); mMagneticTargetAnimator = PhysicsAnimator.getInstance(mTargetView);