Merge to head

MyTracks/src/com/google/android/apps/mytracks/services/DefaultTrackNameFactory.java

@@ -16,14 +16,12 @@
 package com.google.android.apps.mytracks.services;
 
 import com.google.android.apps.mytracks.Constants;
+import com.google.android.apps.mytracks.util.StringUtils;
 import com.google.android.maps.mytracks.R;
 
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import java.text.DateFormat;
-import java.util.Date;
-
 /**
  * Creates a default track name based on the current default track name policy.
  * 
@@ -46,8 +44,7 @@ class DefaultTrackNameFactory {
    */
   String newTrackName(long trackId, long startTime) {
     if (useTimestampTrackName()) {
-      DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
-      return formatter.format(new Date(startTime));
+      return StringUtils.formatDateTime(startTime);
     } else {
       return String.format(context.getString(R.string.track_name_format), trackId);
     }

MyTracks/src/com/google/android/apps/mytracks/services/sensors/BluetoothSensorManager.java

@@ -130,8 +130,8 @@ public class BluetoothSensorManager extends SensorManager {
     SharedPreferences prefs = context.getSharedPreferences(
         Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
     String address =
-      prefs.getString(context.getString(R.string.bluetooth_sensor_key), null);
-    if (address == null) {
+      prefs.getString(context.getString(R.string.bluetooth_sensor_key), "");
+    if (address == null || address.equals("")) {
       return;
     }
     Log.w(Constants.TAG, "Connecting to bluetooth sensor: " + address);

MyTracks/src/com/google/android/apps/mytracks/services/sensors/SensorUtils.java

@@ -99,7 +99,7 @@ public class SensorUtils {
   public static String getStateAsString(Sensor.SensorState state, Context c) {
     switch (state) {
       case NONE:
-        return c.getString(R.string.sensor_type_value_none);
+        return c.getString(R.string.settings_sensor_type_none);
       case CONNECTING:
         return c.getString(R.string.sensor_state_connecting);
       case CONNECTED: