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

Commit 46263369 authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am 66cedab6: Merge "Fix time-related ScaleGestureDetector methods" into jb-mr1.1-dev 

* commit '66cedab6':
  Fix time-related ScaleGestureDetector methods
parents 57c23a46 66cedab6

core/java/android/view/ScaleGestureDetector.java

+4 −0
Original line number Diff line number Diff line
@@ -259,6 +259,8 @@ public class ScaleGestureDetector { 
            mInputEventConsistencyVerifier.onTouchEvent(event, 0);

        }



        mCurrTime = event.getEventTime();



        final int action = event.getActionMasked();



        final boolean streamComplete = action == MotionEvent.ACTION_UP ||
@@ -341,6 +343,7 @@ public class ScaleGestureDetector { 
            mPrevSpanX = mCurrSpanX = spanX;

            mPrevSpanY = mCurrSpanY = spanY;

            mPrevSpan = mCurrSpan = span;

            mPrevTime = mCurrTime;

            mInProgress = mListener.onScaleBegin(this);

        }
@@ -359,6 +362,7 @@ public class ScaleGestureDetector { 
                mPrevSpanX = mCurrSpanX;

                mPrevSpanY = mCurrSpanY;

                mPrevSpan = mCurrSpan;

                mPrevTime = mCurrTime;

            }

        }