Sensor logger changes

Don't autostart service or restart after upload
Include a custom activity name in the upload data

code/SensorLogger/res/layout/main.xml

@@ -8,17 +8,29 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:text="Hello Android from NetBeans"/>
+    <TextView
+        android:id="@+id/caption"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/text"
+        android:text="Caption"/>
+    <EditText
+        android:id="@+id/entry"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:drawable/editbox_background"
+        android:layout_below="@id/caption" />
     <Button
         android:id="@+id/start"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/text"
+        android:layout_below="@id/entry"
         android:text="Start/Stop service"/>
     <Button
         android:id="@+id/upload"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/text"
-        android:layout_toRightOf="@+id/start"
+        android:layout_below="@id/entry"
+        android:layout_toRightOf="@id/start"
         android:text="Upload data"/>
 </RelativeLayout>

code/SensorLogger/src/uk/co/md87/android/sensorlogger/MainActivity.java

@@ -11,6 +11,7 @@ import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.TextView;
 
 /**
@@ -21,13 +22,13 @@ public class MainActivity extends Activity implements OnClickListener {
 
     static final String VERSION = "0.1";
 
+    static String ACTIVITY = "Unknown";
+
     /** {@inheritDoc} */
     @Override
     public void onCreate(final Bundle icicle) {
         super.onCreate(icicle);
 
-        startService(new Intent(this, SensorLoggerService.class));
-
         setContentView(R.layout.main);
 
         ((Button) findViewById(R.id.start)).setOnClickListener(this);
@@ -42,11 +43,14 @@ public class MainActivity extends Activity implements OnClickListener {
                 + "Once 1,000 entries have been recorded, the data will be "
                 + "automatically uploaded and erased from the device. You can "
                 + "manually trigger an upload using the button below.\n\n");
+        ((TextView) findViewById(R.id.caption)).setText("Activity name:");
     }
 
     /** {@inheritDoc} */
     @Override
     public void onClick(final View view) {
+        ACTIVITY = ((EditText) findViewById(R.id.entry)).getText().toString();
+        
         if (view.getId() == R.id.start) {
             if (!stopService(new Intent(this, SensorLoggerService.class))) {
                 startService(new Intent(this, SensorLoggerService.class));

code/SensorLogger/src/uk/co/md87/android/sensorlogger/R.java

@@ -11,9 +11,11 @@ public final class R {
     public static final class attr {
     }
     public static final class id {
-        public static final int start=0x7f040001;
+        public static final int caption=0x7f040001;
+        public static final int entry=0x7f040002;
+        public static final int start=0x7f040003;
         public static final int text=0x7f040000;
-        public static final int upload=0x7f040002;
+        public static final int upload=0x7f040004;
     }
     public static final class layout {
         public static final int main=0x7f020000;

code/SensorLogger/src/uk/co/md87/android/sensorlogger/UploaderService.java

@@ -46,6 +46,7 @@ public class UploaderService extends Service implements Runnable {
         post.addHeader("x-application", "SensorLogger");
         post.addHeader("x-version", MainActivity.VERSION);
         post.addHeader("x-imei", ((TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE)).getDeviceId());
+        post.addHeader("x-activity", MainActivity.ACTIVITY);
 
         try {
             int code = new DefaultHttpClient().execute(post).getStatusLine().getStatusCode();
@@ -55,7 +56,6 @@ public class UploaderService extends Service implements Runnable {
             Log.e("UploaderService", "Unable to upload sensor logs", ex);
         }
 
-        startService(new Intent(this, SensorLoggerService.class));
         stopSelf();
     }