Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47289344 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix for unexpected scale factors in ScaleGestureDetector" into qt-dev

parents 8d8d704c dafee65f

core/java/android/view/ScaleGestureDetector.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }