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/xml/preferences.xml

@@ -91,7 +91,7 @@ limitations under the License.
         android:entries="@array/task_frequency_options"
         android:entryValues="@array/task_frequency_values"
         android:defaultValue="-1" />
-        
+
     <com.google.android.apps.mytracks.IntegerListPreference
         android:key="@string/auto_resume_track_timeout_key"
         android:title="@string/settings_auto_resume_track_timeout"
@@ -99,6 +99,14 @@ limitations under the License.
         android:entries="@array/auto_resume_track_timeout_options"
         android:entryValues="@array/auto_resume_track_timeout_values"
         android:defaultValue="10" />
+
+    <CheckBoxPreference
+        android:key="@string/timestamp_track_name_key"
+        android:title="@string/settings_timestamp_track_name"
+        android:summaryOn="@string/settings_timestamp_track_name_on"
+        android:summaryOff="@string/settings_timestamp_track_name_off"
+        android:defaultValue="true" />
+
   </PreferenceScreen>
 
   <!-- Sharing settings -->
@@ -126,7 +134,7 @@ limitations under the License.
           android:title="@string/settings_backup_to_sd"
           android:summary="@string/settings_backup_to_sd_summary"
           android:persistent="false" />
-   	  <Preference
+      <Preference
           android:key="@string/restore_from_sd_key"
           android:title="@string/settings_restore_from_sd"
           android:summary="@string/settings_restore_from_sd_summary"