From a4b6913715a6c00b8f4a0050c2d7d6b44611fe5e Mon Sep 17 00:00:00 2001 From: Miranda Kephart Date: Mon, 14 Mar 2022 13:19:10 -0400 Subject: [PATCH] Express default copy/paste dismiss velocity in dp Bug: 223217079 Fix: 223217079 Test: manual Change-Id: I7c6d95ab2478bd486d117e049b14d828c521db77 --- .../systemui/screenshot/DraggableConstraintLayout.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/DraggableConstraintLayout.java b/packages/SystemUI/src/com/android/systemui/screenshot/DraggableConstraintLayout.java index 0b987677eac96..4f0455d3de724 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/DraggableConstraintLayout.java +++ b/packages/SystemUI/src/com/android/systemui/screenshot/DraggableConstraintLayout.java @@ -44,10 +44,13 @@ import com.android.systemui.R; public class DraggableConstraintLayout extends ConstraintLayout implements ViewTreeObserver.OnComputeInternalInsetsListener { + private static final float VELOCITY_DP_PER_MS = 1; + private final SwipeDismissHandler mSwipeDismissHandler; private final GestureDetector mSwipeDetector; private View mActionsContainer; private SwipeDismissCallbacks mCallbacks; + private final DisplayMetrics mDisplayMetrics; /** * Stores the callbacks when the view is interacted with or dismissed. @@ -86,6 +89,9 @@ public class DraggableConstraintLayout extends ConstraintLayout public DraggableConstraintLayout(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); + mDisplayMetrics = new DisplayMetrics(); + mContext.getDisplay().getRealMetrics(mDisplayMetrics); + mSwipeDismissHandler = new SwipeDismissHandler(mContext, this); setOnTouchListener(mSwipeDismissHandler); @@ -283,7 +289,8 @@ public class DraggableConstraintLayout extends ConstraintLayout } void dismiss() { - ValueAnimator anim = createSwipeDismissAnimation(3); + float velocityPxPerMs = FloatingWindowUtil.dpToPx(mDisplayMetrics, VELOCITY_DP_PER_MS); + ValueAnimator anim = createSwipeDismissAnimation(velocityPxPerMs); mCallbacks.onSwipeDismissInitiated(anim); dismiss(anim); }