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

Merge "Limit maximum dismiss distance for screenshot/clipboard UI" into tm-qpr-dev

Browse Source
This commit is contained in:
Miranda Kephart
2023-03-06 20:03:42 +00:00
committed by Android (Google) Code Review
parent dccbda11b8 e4b2b30698
commit 0f7e276a99
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,7 @@ public class DraggableConstraintLayout extends ConstraintLayout
implements ViewTreeObserver.OnComputeInternalInsetsListener { implements ViewTreeObserver.OnComputeInternalInsetsListener {
private static final float VELOCITY_DP_PER_MS = 1; private static final float VELOCITY_DP_PER_MS = 1;
private static final int MAXIMUM_DISMISS_DISTANCE_DP = 400;
private final SwipeDismissHandler mSwipeDismissHandler; private final SwipeDismissHandler mSwipeDismissHandler;
private final GestureDetector mSwipeDetector; private final GestureDetector mSwipeDetector;
@@ -347,14 +348,18 @@ public class DraggableConstraintLayout extends ConstraintLayout
} else { } else {
finalX = -1 * getBackgroundRight(); finalX = -1 * getBackgroundRight();
} }
float distance = Math.abs(finalX - startX); float distance = Math.min(Math.abs(finalX - startX),
FloatingWindowUtil.dpToPx(mDisplayMetrics, MAXIMUM_DISMISS_DISTANCE_DP));
// ensure that view dismisses in the right direction (right in LTR, left in RTL)
float distanceVector = Math.copySign(distance, finalX - startX);
anim.addUpdateListener(animation -> { anim.addUpdateListener(animation -> {
float translation = MathUtils.lerp(startX, finalX, animation.getAnimatedFraction()); float translation = MathUtils.lerp(
startX, startX + distanceVector, animation.getAnimatedFraction());
mView.setTranslationX(translation); mView.setTranslationX(translation);
mView.setAlpha(1 - animation.getAnimatedFraction()); mView.setAlpha(1 - animation.getAnimatedFraction());
}); });
anim.setDuration((long) (distance / Math.abs(velocity))); anim.setDuration((long) (Math.abs(distance / velocity)));
return anim; return anim;
} }