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

am 4280891d: Merge "The bigger touch slop still has a problem"

Browse Source 
* commit '4280891dbc2cf60bdf51726e0aa9265ccb64ec88':
  The bigger touch slop still has a problem
This commit is contained in:
Jean-Baptiste Queru
2012-02-22 09:56:27 -08:00
committed by Android Git Automerger
parent 3ebde8a230 4280891dbc
commit aff90790df
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/view/GestureDetector.java Normal file → Executable file
View File

@@ -193,8 +193,7 @@ public class GestureDetector {
} }
} }
// TODO: ViewConfiguration private int mBiggerTouchSlopSquare;
private int mBiggerTouchSlopSquare = 20 * 20;
private int mTouchSlopSquare; private int mTouchSlopSquare;
private int mDoubleTapSlopSquare; private int mDoubleTapSlopSquare;
@@ -408,6 +407,14 @@ public class GestureDetector {
} }
mTouchSlopSquare = touchSlop * touchSlop; mTouchSlopSquare = touchSlop * touchSlop;
mDoubleTapSlopSquare = doubleTapSlop * doubleTapSlop; mDoubleTapSlopSquare = doubleTapSlop * doubleTapSlop;
// The biggerTouchSlop should be a little bit bigger than touchSlop
// and mBiggerTouchSlopSquare should not be over mDoubleTapSlopSquare.
int biggerTouchSlop = (int)(touchSlop * 1.25f);
mBiggerTouchSlopSquare = biggerTouchSlop * biggerTouchSlop;
if (mBiggerTouchSlopSquare > mDoubleTapSlopSquare) {
mBiggerTouchSlopSquare = mDoubleTapSlopSquare;
}
} }
/** /**