From bfe835a58edab5d41831f87e86ec534786db4d4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= Date: Tue, 7 Feb 2012 13:56:13 +0100 Subject: Add settings menu to Android app. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit – New main activity. – Options menu to go to Same settings. --- .../java/com/orbekk/SameControllerActivity.java | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) (limited to 'same-android/src/main/java/com/orbekk/SameControllerActivity.java') diff --git a/same-android/src/main/java/com/orbekk/SameControllerActivity.java b/same-android/src/main/java/com/orbekk/SameControllerActivity.java index 975a1df..fb9b103 100644 --- a/same-android/src/main/java/com/orbekk/SameControllerActivity.java +++ b/same-android/src/main/java/com/orbekk/SameControllerActivity.java @@ -46,6 +46,10 @@ public class SameControllerActivity extends Activity { t.setText(new Broadcaster(this).getBroadcastAddress().getHostAddress()); } + public void doneClicked(View unused) { + finish(); + } + /** * Called when the activity is first created. * @param savedInstanceState If the activity is being re-initialized after @@ -59,22 +63,8 @@ public class SameControllerActivity extends Activity { System.setProperty("java.net.preferIPv4Stack", "true"); System.setProperty("java.net.preferIPv6Addresses", "false"); - setContentView(R.layout.main); - showIpAddress(); - // showBroadcastAddress(); - -// ClientApp client = new ClientApp(); -// SameInterface client_ = client.getClient(10015, "ClientNetwork", -// "http://10.0.0.6:10010/"); -// GameController controller = GameController.create( -// GameController.newPlayer(), client_); -// setContentView(new GameView(this, controller)); - -// Broadcast broadcast = new Broadcast(this); -// broadcast.sendBroadcast("Broadcast test".getBytes(), 10010); -// Broadcaster broadcaster = new Broadcaster(); -// Log.i(TAG, "Broadcast success: " + broadcaster.sendBroadcast(10010, "Broadcast test from Android".getBytes())); -// + setContentView(R.layout.controller); + showIpAddress(); } @Override -- cgit v1.2.3