Commit 88a56757 authored May 04, 2021 by Nader Jawad Committed by Automerger Merge Worker May 04, 2021

Merge changes from topic "fling_after_pull" into sc-dev am: d8f57c7c

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

Change-Id: Ieaa0d0bee9f352b3bff34fff87ade2a9ab5f6185

parents 6c67f654 d8f57c7c

core/java/android/widget/EdgeEffect.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -442,7 +442,6 @@ public class EdgeEffect {
		if (mEdgeEffectType == TYPE_STRETCH) {
		mState = STATE_RECEDE;
		mVelocity = velocity * ON_ABSORB_VELOCITY_ADJUSTMENT;
		mDistance = 0;
		mStartTime = AnimationUtils.currentAnimationTimeMillis();
		} else {
		mState = STATE_ABSORB;