X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FSetupActivity.java;h=6c2d9d7ae9eefc9758c85361cbf631e7f3569662;hb=d5c038473d56ebbe61b8a71b5eb28d03385f8c48;hp=ef802f0f01bea5f4c4e98f0f61d64af00de58406;hpb=d81f94fd5339d513de9bde5a2e19f8eca526344f;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/SetupActivity.java b/altosdroid/src/org/altusmetrum/AltosDroid/SetupActivity.java
index ef802f0f..6c2d9d7a 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/SetupActivity.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/SetupActivity.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -30,13 +31,14 @@ import android.view.View.*;
 import android.widget.*;
 import android.widget.AdapterView.*;
 
-import org.altusmetrum.altoslib_10.*;
+import org.altusmetrum.altoslib_12.*;
 
 public class SetupActivity extends Activity {
 	private Spinner select_rate;
 	private Spinner set_units;
 	private Spinner map_type;
 	private Spinner map_source;
+	private Button manage_frequencies;
 	private Button preload_maps;
 	private Button done;
 
@@ -240,6 +242,11 @@ public class SetupActivity extends Activity {
 		add_change(AltosDroid.SETUP_MAP_SOURCE);
 	}
 
+	private void manage_frequencies(){
+		Intent intent = new Intent(this, ManageFrequenciesActivity.class);
+		startActivity(intent);
+	}
+
 	private void preload_maps(){
 		Intent intent = new Intent(this, PreloadMapActivity.class);
 		startActivity(intent);
@@ -249,6 +256,12 @@ public class SetupActivity extends Activity {
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
+		AltosDebug.init(this);
+		AltosDebug.debug("+++ ON CREATE +++");
+
+		// Initialise preferences
+		AltosDroidPreferences.init(this);
+
 		// Setup the window
 		requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
 		setContentView(R.layout.setup);
@@ -294,6 +307,13 @@ public class SetupActivity extends Activity {
 			});
 
 
+		manage_frequencies = (Button) findViewById(R.id.manage_frequencies);
+		manage_frequencies.setOnClickListener(new OnClickListener() {
+				public void onClick(View v) {
+					manage_frequencies();
+				}
+			});
+
 		preload_maps = (Button) findViewById(R.id.preload_maps);
 		preload_maps.setOnClickListener(new OnClickListener() {
 				public void onClick(View v) {