Merge "Express default copy/paste dismiss velocity in dp" into tm-dev am: c88a1ff323

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

Change-Id: Ib9b7e41dd00ad4b2ab78ed72c236eaba27e1e97d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Miranda Kephart
2022-03-25 16:53:41 +00:00
committed by Automerger Merge Worker

View File

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