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

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

Change-Id: I4088bd6b9442489ec0f638fcd274adc28921bdaa
This commit is contained in:
TreeHugger Robot
2021-07-22 20:00:58 +00:00
committed by Automerger Merge Worker

View File

@@ -158,14 +158,16 @@ public class PipDismissTargetHandler implements ViewTreeObserver.OnPreDrawListen
@Override
public void onReleasedInTarget(@NonNull MagnetizedObject.MagneticTarget target) {
mMainExecutor.executeDelayed(() -> {
mMotionHelper.notifyDismissalPending();
mMotionHelper.animateDismiss();
hideDismissTargetMaybe();
if (mEnableDismissDragToEdge) {
mMainExecutor.executeDelayed(() -> {
mMotionHelper.notifyDismissalPending();
mMotionHelper.animateDismiss();
hideDismissTargetMaybe();
mPipUiEventLogger.log(
PipUiEventLogger.PipUiEventEnum.PICTURE_IN_PICTURE_DRAG_TO_REMOVE);
}, 0);
mPipUiEventLogger.log(
PipUiEventLogger.PipUiEventEnum.PICTURE_IN_PICTURE_DRAG_TO_REMOVE);
}, 0);
}
}
});