Fix comment b287683b8500

MyTracks/res/values/keys.xml

@@ -36,7 +36,6 @@ limitations under the License.
   <string name="send_to_fusion_tables_key">sendToFusionTables</string>
   <string name="send_to_maps_key">sendToMaps</string>
   <string name="sensor_type_key">sensorType</string>
-  <string name="settings_recording_track_name_key">settingsRecordingTrackName</string>
   <string name="share_url_only_key">shareUrlOnly</string>
   <string name="split_frequency_key">splitFrequency</string>
   <string name="track_color_mode_dynamic_speed_variation_key">trackColorModeDynamicVariation
@@ -48,7 +47,8 @@ limitations under the License.
           </string>
   <string name="track_color_mode_fixed_speed_slow_key">trackColorModeFixedSlow</string>
   <string name="track_color_mode_key">trackColorMode</string>
-    
+  <string name="track_name_key">trackName</string>
+
   <!-- Preference keys which keep transient state (not user preferences). Sorted alphabetically.
        - DO NOT TRANSLATE -->
   <string name="auto_resume_track_current_retry_key">autoResumeTrackCurrentRetry</string>

MyTracks/res/xml/preferences.xml

@@ -137,7 +137,7 @@ limitations under the License.
         android:entryValues="@array/recording_auto_resume_timeout_values"
         android:defaultValue="10" />
 
-    <ListPreference android:key="@string/settings_recording_track_name_key"
+    <ListPreference android:key="@string/track_name_key"
         android:title="@string/settings_recording_track_name"
         android:summary="@string/settings_recording_track_name_summary"
         android:entries="@array/settings_recording_track_name_options"

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

@@ -47,11 +47,7 @@ public class DefaultTrackNameFactory {
    * @param startTime the track start time
    */
   public String getDefaultTrackName(long trackId, long startTime) {
-    SharedPreferences sharedPreferences = context.getSharedPreferences(
-        Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
-    String trackNameSetting = sharedPreferences.getString(
-        context.getString(R.string.settings_recording_track_name_key),
-        context.getString(R.string.settings_recording_track_name_date_local_value));
+    String trackNameSetting = getTrackNameSetting();
 
     if (trackNameSetting.equals(
         context.getString(R.string.settings_recording_track_name_date_local_value))) {
@@ -61,10 +57,21 @@ public class DefaultTrackNameFactory {
       SimpleDateFormat dateFormat = new SimpleDateFormat(ISO_8601_FORMAT);
       return dateFormat.format(startTime);
     } else {
-
       // trackNameSetting equals
       // R.string.settings_recording_track_name_number_value
       return String.format(context.getString(R.string.track_name_format), trackId);
     }
   }
+
+  /**
+   * Gets the track name setting.
+   */
+  @VisibleForTesting
+  String getTrackNameSetting() {
+    SharedPreferences sharedPreferences = context.getSharedPreferences(
+        Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
+    return sharedPreferences.getString(
+        context.getString(R.string.settings_recording_track_name_key),
+        context.getString(R.string.settings_recording_track_name_date_local_value));
+  }
 }