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

Merge "Fixed EdgeEffect drawn on non-RecordingCanvas" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-22 18:34:07 +00:00
committed by Android (Google) Code Review
parent f6561f6c82 2e91e0e01c
commit caab1b26a3
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -640,6 +640,12 @@ public class EdgeEffect {
mWidth,
mHeight
);
} else {
// This is TYPE_STRETCH and drawing into a Canvas that isn't a Recording Canvas,
// so no effect can be shown. Just end the effect.
mState = STATE_IDLE;
mDistance = 0;
mVelocity = 0;
}
boolean oneLastFrame = false;
@@ -771,8 +777,9 @@ public class EdgeEffect {
* considered at rest or false if it is still animating.
*/
private boolean isAtEquilibrium() {
double displacement = mDistance * mHeight; // in pixels
return Math.abs(mVelocity) < VELOCITY_THRESHOLD
double displacement = mDistance * mHeight * LINEAR_STRETCH_INTENSITY; // in pixels
double velocity = mVelocity * LINEAR_STRETCH_INTENSITY;
return Math.abs(velocity) < VELOCITY_THRESHOLD
&& Math.abs(displacement) < VALUE_THRESHOLD;
}