summaryrefslogtreecommitdiff
path: root/client/Piztor/src/com/macaroon/piztor/MultiTouchListener.java
diff options
context:
space:
mode:
authorTeddy <ted.sybil@gmail.com>2013-08-27 08:48:13 +0800
committerTeddy <ted.sybil@gmail.com>2013-08-27 08:48:13 +0800
commit3849201b28bc38bb8b42574bdf847dd7a5ce8aa7 (patch)
tree922a19e548553fb500252e131c6b2745eeca7648 /client/Piztor/src/com/macaroon/piztor/MultiTouchListener.java
parentae935e1c38c7ffe662fa3381b0a5bd8b91c72b49 (diff)
parent0cfa72f9f352a81ff40ce41d2a94aa4f63d3a815 (diff)
Merge branch 'master' of github.com:Determinant/piztor
Diffstat (limited to 'client/Piztor/src/com/macaroon/piztor/MultiTouchListener.java')
-rw-r--r--client/Piztor/src/com/macaroon/piztor/MultiTouchListener.java12
1 files changed, 4 insertions, 8 deletions
diff --git a/client/Piztor/src/com/macaroon/piztor/MultiTouchListener.java b/client/Piztor/src/com/macaroon/piztor/MultiTouchListener.java
index 2bd379d..cf4911b 100644
--- a/client/Piztor/src/com/macaroon/piztor/MultiTouchListener.java
+++ b/client/Piztor/src/com/macaroon/piztor/MultiTouchListener.java
@@ -1,19 +1,15 @@
package com.macaroon.piztor;
-import android.app.Activity;
+import android.annotation.SuppressLint;
import android.graphics.Matrix;
import android.graphics.PointF;
-import android.os.Bundle;
-import android.os.SystemClock;
import android.util.FloatMath;
-import android.util.Log;
import android.view.MotionEvent;
import android.view.View;
import android.view.View.OnTouchListener;
-import android.view.GestureDetector;
-import android.view.GestureDetector.SimpleOnGestureListener;
import android.widget.ImageView;
+@SuppressLint("FloatMath")
public class MultiTouchListener implements OnTouchListener {
private Matrix matrix = new Matrix();
@@ -27,9 +23,9 @@ public class MultiTouchListener implements OnTouchListener {
private PointF start = new PointF();
private PointF mid = new PointF();
private float preDis = 1f;
- private float d = 0f;
+ /*private float d = 0f;
private float newRot = 0f;
- private float[] values;
+ private float[] values;*/
@Override
public boolean onTouch(View v, MotionEvent event) {