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

Merge "Merge "Fix for unexpected scale factors in ScaleGestureDetector" into qt-dev am: 472893443d" into qt-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2019-04-15 21:28:10 +00:00
committed by Android (Google) Code Review
parent 9a50fa5ceb 3d83ec9640
commit 52d8fd98aa
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/ScaleGestureDetector.java
View File

@@ -551,7 +551,7 @@ public class ScaleGestureDetector {
(mEventBeforeOrAboveStartingGestureEvent && (mCurrSpan < mPrevSpan)) || (mEventBeforeOrAboveStartingGestureEvent && (mCurrSpan < mPrevSpan)) ||
(!mEventBeforeOrAboveStartingGestureEvent && (mCurrSpan > mPrevSpan)); (!mEventBeforeOrAboveStartingGestureEvent && (mCurrSpan > mPrevSpan));
final float spanDiff = (Math.abs(1 - (mCurrSpan / mPrevSpan)) * SCALE_FACTOR); 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; return mPrevSpan > 0 ? mCurrSpan / mPrevSpan : 1;
} }