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

Merge "Fix bug in EdgeEffect with glow" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-17 17:47:22 +00:00
committed by Android (Google) Code Review
parent fa304e1f71 a479a3268f
commit 046c050aa6
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -354,13 +354,14 @@ public class EdgeEffect {
mDistance = Math.max(0f, mPullDistance);
mVelocity = 0;
final float absdd = Math.abs(deltaDistance);
mGlowAlpha = mGlowAlphaStart = Math.min(MAX_ALPHA,
mGlowAlpha + (absdd * PULL_DISTANCE_ALPHA_GLOW_FACTOR));
if (mPullDistance == 0) {
mGlowScaleY = mGlowScaleYStart = 0;
mGlowAlpha = mGlowAlphaStart = 0;
} else {
final float absdd = Math.abs(deltaDistance);
mGlowAlpha = mGlowAlphaStart = Math.min(MAX_ALPHA,
mGlowAlpha + (absdd * PULL_DISTANCE_ALPHA_GLOW_FACTOR));
final float scale = (float) (Math.max(0, 1 - 1 /
Math.sqrt(Math.abs(mPullDistance) * mBounds.height()) - 0.3d) / 0.7d);
@@ -698,7 +699,9 @@ public class EdgeEffect {
mGlowAlpha = mGlowAlphaStart + (mGlowAlphaFinish - mGlowAlphaStart) * interp;
mGlowScaleY = mGlowScaleYStart + (mGlowScaleYFinish - mGlowScaleYStart) * interp;
mDistance = calculateDistanceFromGlowValues(mGlowScaleY, mGlowAlpha);
if (mState != STATE_PULL) {
mDistance = calculateDistanceFromGlowValues(mGlowScaleY, mGlowAlpha);
}
mDisplacement = (mDisplacement + mTargetDisplacement) / 2;
if (t >= 1.f - EPSILON) {