From dafee65f21c8cdcaeca6488352dfcfc94bcd98ce Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Wed, 10 Apr 2019 14:13:52 -0700 Subject: Fix for unexpected scale factors in ScaleGestureDetector Provided by levischmidt@google.com Test: cts: atest ScaleGestureDetector Fixes: 122328202 Change-Id: Ie229c39f65e4ac72a3f8e22317633f648f7fa008 --- core/java/android/view/ScaleGestureDetector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/java/android') diff --git a/core/java/android/view/ScaleGestureDetector.java b/core/java/android/view/ScaleGestureDetector.java index 7c69cfde2b9e..1d721516a979 100644 --- a/core/java/android/view/ScaleGestureDetector.java +++ b/core/java/android/view/ScaleGestureDetector.java @@ -551,7 +551,7 @@ public class ScaleGestureDetector { (mEventBeforeOrAboveStartingGestureEvent && (mCurrSpan < mPrevSpan)) || (!mEventBeforeOrAboveStartingGestureEvent && (mCurrSpan > mPrevSpan)); final float spanDiff = (Math.abs(1 - (mCurrSpan / mPrevSpan)) * SCALE_FACTOR); - return mPrevSpan <= 0 ? 1 : scaleUp ? (1 + spanDiff) : (1 - spanDiff); + return mPrevSpan <= mSpanSlop ? 1 : scaleUp ? (1 + spanDiff) : (1 - spanDiff); } return mPrevSpan > 0 ? mCurrSpan / mPrevSpan : 1; } -- cgit v1.2.3