Commit b00eba73 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: I2805d99d8c6cd011e906ad676fa70795f4366c1f

parents 930d7b4e 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;