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

This commit is contained in:
TreeHugger Robot
2021-07-22 19:29:10 +00:00
committed by Android (Google) Code Review

View File

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