Adding more tests and other minor fixes.

SignalStrengthSampler/res/values/strings.xml

@@ -21,6 +21,9 @@
   <string name="settings_auto_start">Automatic start</string>
   <string name="settings_auto_start_summary_on">Automatically start inserting signal strength waypoints whenever My Tracks starts recording a track.</string>
   <string name="settings_auto_start_summary_off">You will need to manually start signal sampling using the controls below.</string>
+  <string name="settings_auto_stop">Automatic stop</string>
+  <string name="settings_auto_stop_summary_on">Automatically stop inserting signal strength waypoints whenever My Tracks stops recording a track.</string>
+  <string name="settings_auto_stop_summary_off">You will need to manually stop signal sampling using the controls below.</string>
   <string name="settings_min_signal_sampling_period">Min. sampling period</string>
   <string name="settings_min_signal_sampling_period_summary">Minimum time between two recordings of the phone\'s signal strength</string>
 
@@ -44,6 +47,7 @@
 
   <!-- Non-translatable strings -->
   <string name="settings_auto_start_key">autoStartSampling</string>
+  <string name="settings_auto_stop_key">autoStopSampling</string>
   <string name="settings_min_signal_sampling_period_key">signalSamplingFrequency</string>
   <string name="settings_control_start_key">startSamplingControl</string>
   <string name="settings_control_stop_key">stopSamplingControl</string>

SignalStrengthSampler/res/xml/preferences.xml

@@ -21,6 +21,11 @@
                         android:summaryOn="@string/settings_auto_start_summary_on"
                         android:summaryOff="@string/settings_auto_start_summary_off"
                         android:defaultValue="false" />
+    <CheckBoxPreference android:key="@string/settings_auto_stop_key"
+                        android:title="@string/settings_auto_stop"
+                        android:summaryOn="@string/settings_auto_stop_summary_on"
+                        android:summaryOff="@string/settings_auto_stop_summary_off"
+                        android:defaultValue="true" />
 
     <ListPreference
         android:key="@string/settings_min_signal_sampling_period_key"

SignalStrengthSampler/src/com/google/android/apps/mytracks/signalstrength/RecordingStateReceiver.java

@@ -32,19 +32,27 @@ public class RecordingStateReceiver extends BroadcastReceiver {
   @Override
   public void onReceive(Context ctx, Intent intent) {
     SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(ctx);
-    boolean autoStart = preferences.getBoolean(
-        ctx.getString(R.string.settings_auto_start_key), false);
-    if (!autoStart) {
-      Log.d(TAG, "Not auto-starting signal sampling");
-      return;
-    }
 
     String action = intent.getAction();
     if (ctx.getString(R.string.track_started_broadcast_action).equals(action) ||
         ctx.getString(R.string.track_resumed_broadcast_action).equals(action)) {
+      boolean autoStart = preferences.getBoolean(
+          ctx.getString(R.string.settings_auto_start_key), false);
+      if (!autoStart) {
+        Log.d(TAG, "Not auto-starting signal sampling");
+        return;
+      }
+
       startService(ctx);
     } else if (ctx.getString(R.string.track_stopped_broadcast_action).equals(action) ||
                ctx.getString(R.string.track_paused_broadcast_action).equals(action)) {
+      boolean autoStop = preferences.getBoolean(
+          ctx.getString(R.string.settings_auto_stop_key), true);
+      if (!autoStop) {
+        Log.d(TAG, "Not auto-stopping signal sampling");
+        return;
+      }
+
       stopService(ctx);
     } else {
       Log.e(TAG, "Unknown action received: " + action);

SignalStrengthSampler/src/com/google/android/apps/mytracks/signalstrength/SignalStrengthService.java

@@ -58,10 +58,9 @@ public class SignalStrengthService extends Service
   public void onCreate() {
     super.onCreate();
 
-    mytracksServiceComponent =
-      new ComponentName(
-          getString(R.string.mytracks_service_package),
-          getString(R.string.mytracks_service_class));
+    mytracksServiceComponent = new ComponentName(
+        getString(R.string.mytracks_service_package),
+        getString(R.string.mytracks_service_class));
     preferences = PreferenceManager.getDefaultSharedPreferences(this);
     signalListenerFactory = new SignalStrengthListenerFactory();
   }