summaryrefslogtreecommitdiff
path: root/client/Piztor/src
diff options
context:
space:
mode:
authorGoblin911 <[email protected]>2013-08-27 11:05:28 +0800
committerGoblin911 <[email protected]>2013-08-27 11:05:28 +0800
commitf8945d9f2be18b1c05d66a5e2dba351061e2a57b (patch)
tree3be30d087c9245a0d1d1a846a9d12e9ce735d34a /client/Piztor/src
parentf4595bc3d9afaac5d3c91bb95dff0217cf5b728c (diff)
parent2c3891cf77538c57b172404c5c35b846ec6b0de6 (diff)
Merge branch 'master' of ssh://github.com/Determinant/piztor
Diffstat (limited to 'client/Piztor/src')
-rw-r--r--client/Piztor/src/com/macaroon/piztor/Main.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/client/Piztor/src/com/macaroon/piztor/Main.java b/client/Piztor/src/com/macaroon/piztor/Main.java
index f9e8b00..8b0918d 100644
--- a/client/Piztor/src/com/macaroon/piztor/Main.java
+++ b/client/Piztor/src/com/macaroon/piztor/Main.java
@@ -11,6 +11,7 @@ import android.view.KeyEvent;
import android.view.Menu;
import android.view.View;
import android.widget.ImageButton;
+import android.widget.ImageView;
public class Main extends PiztorAct {
final static int SearchButtonPress = 1;
@@ -202,6 +203,8 @@ public class Main extends PiztorAct {
autodate = new Timer();
AppMgr.transam.setHandler(fromTransam);
setContentView(R.layout.activity_main);
+ ImageView view = (ImageView) findViewById(R.id.main_mapview);
+ view.setOnTouchListener(new MultiTouchListener());
}
@Override
@@ -212,15 +215,16 @@ public class Main extends PiztorAct {
btnSearch = (ImageButton) findViewById(R.id.footbar_btn_search);
btnSettings = (ImageButton) findViewById(R.id.footbar_btn_settings);
btnFetch.setOnClickListener(new View.OnClickListener() {
+
@Override
public void onClick(View arg0) {
- actMgr.trigger(FetchButtonPress);
+ // actMgr.trigger(FetchButtonPress);
}
});
btnFocus.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- actMgr.trigger(FocuseButtonPress);
+ // actMgr.trigger(FocuseButtonPress);
}
});
btnSettings.setOnClickListener(new View.OnClickListener() {
@@ -229,7 +233,7 @@ public class Main extends PiztorAct {
actMgr.trigger(AppMgr.toSettings);
}
});
- autodate.schedule(new AutoUpdate(), 0, 5000);
+ //autodate.schedule(new AutoUpdate(), 0, 5000);
}
@Override
@@ -248,4 +252,4 @@ public class Main extends PiztorAct {
return false;
}
-} \ No newline at end of file
+}