Combine b2f2f9e9e9 and 8774b3663c

Allow users to choose the default track name policy.  By default, we'll switch
to a new, timestamp-based name.  If they change the pref, they'll get the
old-style 'track n' style.

MyTracks/res/values/keys.xml

@@ -38,6 +38,7 @@ limitations under the License.
   <string name="share_url_only_key">shareUrlOnly</string>
   <string name="signal_sampling_frequency_key">signalSamplingFrequency</string>
   <string name="split_frequency_key">splitFrequency</string>
+  <string name="timestamp_track_name_key">timestampTrackName</string>
 
   <!-- Preference keys which keep transient state (not user preferences) - DO NOT TRANSLATE -->
   <string name="auto_resume_track_current_retry_key">autoResumeTrackCurrentRetry</string>
@@ -47,4 +48,4 @@ limitations under the License.
   <!-- Keys for non-persisted preferences - DO NOT TRANSLATE -->
   <string name="backup_to_sd_key">backupToSd</string>
   <string name="restore_from_sd_key">restoreFromSd</string>
-</resources>
+</resources>

MyTracks/res/values/strings.xml

@@ -210,6 +210,10 @@ limitations under the License.
   <string name="settings_auto_resume_track_timeout">Auto-resume track timeout</string>
   <string name="settings_auto_resume_track_timeout_summary">Maximum time in minutes after which a previously recording track will not be resumed on phone reboot</string>
 
+  <string name="settings_timestamp_track_name">Timestamp as track name</string>
+  <string name="settings_timestamp_track_name_on">The default track name will be the date and time at the start of the track</string>
+  <string name="settings_timestamp_track_name_off">Track names will have numbers which increment for each new track.</string>
+
   <string name="pace_label">Pace</string>
 
   <string name="eclair_required">Only supported in Android 2.0 or above</string>