Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Miranda Kephart
2022-03-25 14:49:55 +00:00
committed by Android (Google) Code Review
parent 2a94c0af0b a4b6913715
commit c88a1ff323
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/src/com/android/systemui/screenshot/DraggableConstraintLayout.java
View File

@@ -44,10 +44,13 @@ import com.android.systemui.R;
public class DraggableConstraintLayout extends ConstraintLayout public class DraggableConstraintLayout extends ConstraintLayout
implements ViewTreeObserver.OnComputeInternalInsetsListener { implements ViewTreeObserver.OnComputeInternalInsetsListener {
private static final float VELOCITY_DP_PER_MS = 1;
private final SwipeDismissHandler mSwipeDismissHandler; private final SwipeDismissHandler mSwipeDismissHandler;
private final GestureDetector mSwipeDetector; private final GestureDetector mSwipeDetector;
private View mActionsContainer; private View mActionsContainer;
private SwipeDismissCallbacks mCallbacks; private SwipeDismissCallbacks mCallbacks;
private final DisplayMetrics mDisplayMetrics;
/** /**
* Stores the callbacks when the view is interacted with or dismissed. * 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) { public DraggableConstraintLayout(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr); super(context, attrs, defStyleAttr);
mDisplayMetrics = new DisplayMetrics();
mContext.getDisplay().getRealMetrics(mDisplayMetrics);
mSwipeDismissHandler = new SwipeDismissHandler(mContext, this); mSwipeDismissHandler = new SwipeDismissHandler(mContext, this);
setOnTouchListener(mSwipeDismissHandler); setOnTouchListener(mSwipeDismissHandler);
@@ -283,7 +289,8 @@ public class DraggableConstraintLayout extends ConstraintLayout
} }
void dismiss() { void dismiss() {
ValueAnimator anim = createSwipeDismissAnimation(3); float velocityPxPerMs = FloatingWindowUtil.dpToPx(mDisplayMetrics, VELOCITY_DP_PER_MS);
ValueAnimator anim = createSwipeDismissAnimation(velocityPxPerMs);
mCallbacks.onSwipeDismissInitiated(anim); mCallbacks.onSwipeDismissInitiated(anim);
dismiss(anim); dismiss(anim);
} }