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

Merge "Limit overscroll stretch for animation" into sc-dev am: b42f19e297

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15161821

Change-Id: I249a27030e5cd0375bc4e57e89528675557bcd1e
This commit is contained in:
TreeHugger Robot
2021-07-15 20:35:00 +00:00
committed by Automerger Merge Worker
parent af5cbff38c b42f19e297
commit 2d628c1cca
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -365,6 +365,10 @@ public class EdgeEffect {
mDuration = PULL_TIME; mDuration = PULL_TIME;
mPullDistance += deltaDistance; mPullDistance += deltaDistance;
if (edgeEffectBehavior == TYPE_STRETCH) {
// Don't allow stretch beyond 1
mPullDistance = Math.min(1f, mPullDistance);
}
mDistance = Math.max(0f, mPullDistance); mDistance = Math.max(0f, mPullDistance);
mVelocity = 0; mVelocity = 0;
@@ -783,6 +787,10 @@ public class EdgeEffect {
+ mDampedFreq * sinCoeff * Math.cos(mDampedFreq * deltaT)); + mDampedFreq * sinCoeff * Math.cos(mDampedFreq * deltaT));
mDistance = (float) distance / mHeight; mDistance = (float) distance / mHeight;
mVelocity = (float) velocity; mVelocity = (float) velocity;
if (mDistance > 1f) {
mDistance = 1f;
mVelocity = 0f;
}
if (isAtEquilibrium()) { if (isAtEquilibrium()) {
mDistance = 0; mDistance = 0;
mVelocity = 0; mVelocity = 0;