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

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

Browse Source 
* commit '66cedab63bf0c17e59a5815200bd9200164d89ec':
  Fix time-related ScaleGestureDetector methods
This commit is contained in:
Adam Powell
2012-11-28 19:50:46 -08:00
committed by Android Git Automerger
parent 57c23a464a 66cedab63b
commit 4626336957
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}
}