PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 39511301: Fix crash in crop view

Browse Source 
* commit '39511301a29f1965155e848c214dfa4bc3530722':
  Fix crash in crop view
This commit is contained in:
Michael Jurka
2013-10-07 17:19:14 -07:00
committed by Android Git Automerger
parent 090c2ce88a 39511301a2
commit d58000b062
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/CropView.java
+7 -6
View File
@@ -197,13 +197,14 @@ public class CropView extends TiledImageView implements OnScaleGestureListener {
float squaredDist = (mFirstX - x) * (mFirstX - x) + (mFirstY - y) * (mFirstY - y);
float slop = config.getScaledTouchSlop() * config.getScaledTouchSlop();
long now = System.currentTimeMillis();
// only do this if it's a small movement
if (mTouchCallback != null &&
squaredDist < slop &&
now < mTouchDownTime + ViewConfiguration.getTapTimeout()) {
mTouchCallback.onTap();
if (mTouchCallback != null) {
// only do this if it's a small movement
if (squaredDist < slop &&
now < mTouchDownTime + ViewConfiguration.getTapTimeout()) {
mTouchCallback.onTap();
}
mTouchCallback.onTouchUp();
}
mTouchCallback.onTouchUp();
}
if (!mTouchEnabled) {