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

Merge "Fixed and decreased isAtEquilibrium thresholds" into sc-dev

Browse Source
This commit is contained in:
Michel Comin Escude
2021-04-14 18:03:18 +00:00
committed by Android (Google) Code Review
parent 824f5cf953 0c81801f9e
commit 219106593d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/widget/EdgeEffect.java
View File

@@ -104,15 +104,15 @@ public class EdgeEffect {
/**
* The velocity threshold before the spring animation is considered settled.
* The idea here is that velocity should be less than 1 pixel per frame (~16ms).
* The idea here is that velocity should be less than 0.1 pixel per second.
*/
private static final double VELOCITY_THRESHOLD = 1.0 / 0.016;
private static final double VELOCITY_THRESHOLD = 0.1;
/**
* The value threshold before the spring animation is considered close enough to
* the destination to be settled. This should be around 1 pixel.
* the destination to be settled. This should be around 0.01 pixel.
*/
private static final double VALUE_THRESHOLD = 1;
private static final double VALUE_THRESHOLD = 0.01;
/**
* The natural frequency of the stretch spring.
@@ -788,8 +788,8 @@ public class EdgeEffect {
* considered at rest or false if it is still animating.
*/
private boolean isAtEquilibrium() {
double displacement = mDistance * mHeight * LINEAR_STRETCH_INTENSITY; // in pixels
double velocity = mVelocity * LINEAR_STRETCH_INTENSITY;
double displacement = mDistance * mHeight; // in pixels
double velocity = mVelocity;
return Math.abs(velocity) < VELOCITY_THRESHOLD
&& Math.abs(displacement) < VALUE_THRESHOLD;
}