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

DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold

Browse Source 
Change-Id: I13132ce1d912b54e251f7afed5143c72a2ec2e78
This commit is contained in:
Adam Powell
2012-08-31 17:15:32 -07:00
parent 1eca514a1b
commit c4ce0da255
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,8 +86,8 @@ public class ScaleGestureDetector {
* pointers going up.
*
* Once a scale has ended, {@link ScaleGestureDetector#getFocusX()}
* and {@link ScaleGestureDetector#getFocusY()} will return the location
* of the pointer remaining on the screen.
* and {@link ScaleGestureDetector#getFocusY()} will return focal point
* of the pointers remaining on the screen.
*
* @param detector The detector reporting the event - use this to
* retrieve extended info about event state.
@@ -128,6 +128,7 @@ public class ScaleGestureDetector {
private float mCurrSpan;
private float mPrevSpan;
private float mInitialSpan;
private float mCurrSpanX;
private float mCurrSpanY;
private float mPrevSpanX;
@@ -135,6 +136,7 @@ public class ScaleGestureDetector {
private long mCurrTime;
private long mPrevTime;
private boolean mInProgress;
private int mSpanSlop;
/**
* Consistency verifier for debugging purposes.
@@ -146,6 +148,7 @@ public class ScaleGestureDetector {
public ScaleGestureDetector(Context context, OnScaleGestureListener listener) {
mContext = context;
mListener = listener;
mSpanSlop = ViewConfiguration.get(context).getScaledTouchSlop() * 2;
}
/**
@@ -176,6 +179,7 @@ public class ScaleGestureDetector {
if (mInProgress) {
mListener.onScaleEnd(this);
mInProgress = false;
mInitialSpan = 0;
}
if (streamComplete) {
@@ -221,18 +225,24 @@ public class ScaleGestureDetector {
// Dispatch begin/end events as needed.
// If the configuration changes, notify the app to reset its current state by beginning
// a fresh scale event stream.
final boolean wasInProgress = mInProgress;
mFocusX = focusX;
mFocusY = focusY;
if (mInProgress && (span == 0 || configChanged)) {
mListener.onScaleEnd(this);
mInProgress = false;
mInitialSpan = span;
}
if (configChanged) {
mPrevSpanX = mCurrSpanX = spanX;
mPrevSpanY = mCurrSpanY = spanY;
mPrevSpan = mCurrSpan = span;
mInitialSpan = mPrevSpan = mCurrSpan = span;
}
if (!mInProgress && span != 0) {
mFocusX = focusX;
mFocusY = focusY;
if (!mInProgress && span != 0 &&
(wasInProgress || Math.abs(span - mInitialSpan) > mSpanSlop)) {
mPrevSpanX = mCurrSpanX = spanX;
mPrevSpanY = mCurrSpanY = spanY;
mPrevSpan = mCurrSpan = span;
mInProgress = mListener.onScaleBegin(this);
}
@@ -241,8 +251,6 @@ public class ScaleGestureDetector {
mCurrSpanX = spanX;
mCurrSpanY = spanY;
mCurrSpan = span;
mFocusX = focusX;
mFocusY = focusY;
boolean updatePrev = true;
if (mInProgress) {