summaryrefslogtreecommitdiff
path: root/same-android/src/main/java/com/orbekk/same/android/MainActivity.java
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-05-21 14:16:57 +0200
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-05-21 14:16:57 +0200
commit14ba0ed08735052acde18830ea4cf51d1e30c7b9 (patch)
tree9a44d160d1640208e7e7af664d536af8bc7cfabd /same-android/src/main/java/com/orbekk/same/android/MainActivity.java
parentf62786575d01811b4af057c35f8ed4c7a43a4429 (diff)
Add Experiment1Activity.
Diffstat (limited to 'same-android/src/main/java/com/orbekk/same/android/MainActivity.java')
-rw-r--r--same-android/src/main/java/com/orbekk/same/android/MainActivity.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/same-android/src/main/java/com/orbekk/same/android/MainActivity.java b/same-android/src/main/java/com/orbekk/same/android/MainActivity.java
index d79f21a..7bd494e 100644
--- a/same-android/src/main/java/com/orbekk/same/android/MainActivity.java
+++ b/same-android/src/main/java/com/orbekk/same/android/MainActivity.java
@@ -32,6 +32,7 @@ import android.widget.ArrayAdapter;
import android.widget.ListView;
import com.orbekk.same.android.benchmark.ExampleProtobufServerActivity;
+import com.orbekk.same.android.benchmark.Experiment1Activity;
import com.orbekk.same.android.benchmark.RepeatedSetVariableActivity;
public class MainActivity extends Activity {
@@ -44,9 +45,12 @@ public class MainActivity extends Activity {
activities.put("Variable test", VariableTestActivity.class);
activities.put("State monitor", StateViewerActivity.class);
activities.put("Graphics demo", GraphicsActivity.class);
- activities.put("Benchmark", RepeatedSetVariableActivity.class);
+ activities.put("Benchmark (logger)", RepeatedSetVariableActivity.class);
+
activities.put("ExampleProtobufServer (temp)",
ExampleProtobufServerActivity.class);
+
+ activities.put("Experiment 1", Experiment1Activity.class);
}
public final static List<String> activityList =