Merge "Express default copy/paste dismiss velocity in dp" into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
c88a1ff323
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user