Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
268673e836
1 changed files with 8 additions and 9 deletions
|
@ -119,16 +119,15 @@ public class MultiTouchSupport {
|
||||||
listener.onGestureInit(x1, y1, x2, y2);
|
listener.onGestureInit(x1, y1, x2, y2);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
// End only on second-last pointer up, see above
|
case MotionEvent.ACTION_POINTER_UP: {
|
||||||
//case MotionEvent.ACTION_POINTER_UP: {
|
|
||||||
|
|
||||||
// if (inZoomMode || inTiltMode) {
|
if (inZoomMode || inTiltMode) {
|
||||||
// listener.onGestureFinished(scale, rotation);
|
listener.onGestureFinished(scale, rotation);
|
||||||
// inZoomMode = false;
|
inZoomMode = false;
|
||||||
// inTiltMode = false;
|
inTiltMode = false;
|
||||||
// }
|
}
|
||||||
// return true;
|
return true;
|
||||||
//}
|
}
|
||||||
case MotionEvent.ACTION_MOVE: {
|
case MotionEvent.ACTION_MOVE: {
|
||||||
|
|
||||||
if (inZoomMode) {
|
if (inZoomMode) {
|
||||||
|
|
Loading…
Reference in a new issue