Merge changes from topic "fling_after_pull" into sc-dev am: d8f57c7cf3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14414739 Change-Id: Ieaa0d0bee9f352b3bff34fff87ade2a9ab5f6185
This commit is contained in:
@@ -442,7 +442,6 @@ public class EdgeEffect {
|
|||||||
if (mEdgeEffectType == TYPE_STRETCH) {
|
if (mEdgeEffectType == TYPE_STRETCH) {
|
||||||
mState = STATE_RECEDE;
|
mState = STATE_RECEDE;
|
||||||
mVelocity = velocity * ON_ABSORB_VELOCITY_ADJUSTMENT;
|
mVelocity = velocity * ON_ABSORB_VELOCITY_ADJUSTMENT;
|
||||||
mDistance = 0;
|
|
||||||
mStartTime = AnimationUtils.currentAnimationTimeMillis();
|
mStartTime = AnimationUtils.currentAnimationTimeMillis();
|
||||||
} else {
|
} else {
|
||||||
mState = STATE_ABSORB;
|
mState = STATE_ABSORB;
|
||||||
|
|||||||
Reference in New Issue
Block a user