rename statistics markers to split markers

rename waypoint to marker
place my location button below the warning message.

MyTracks/res/layout/help.xml

@@ -91,16 +91,16 @@ limitations under the License.
         android:text="@string/help_saved_files_answer"
         style="@style/HelpAnswer" />
       <TextView
-        android:text="@string/help_waypoint_marker_question"
+        android:text="@string/help_marker_question"
         style="@style/HelpQuestion" />
       <TextView
-        android:text="@string/help_waypoint_marker_answer"
+        android:text="@string/help_marker_answer"
         style="@style/HelpAnswer" />
       <TextView
-        android:text="@string/help_statistics_marker_question"
+        android:text="@string/help_split_marker_question"
         style="@style/HelpQuestion" />
       <TextView
-        android:text="@string/help_statistics_marker_answer"
+        android:text="@string/help_split_marker_answer"
         style="@style/HelpAnswer" />
       <TextView
         android:text="@string/help_delete_tracks_question"

MyTracks/res/layout/map.xml

@@ -26,16 +26,6 @@ limitations under the License.
     android:id="@+id/map_view"
     android:layout_height="fill_parent"
     android:layout_width="fill_parent" />
-  <ImageButton
-    android:background="@drawable/my_location"
-    android:contentDescription="@string/icon_my_location"
-    android:id="@+id/map_my_location"
-    android:layout_alignParentTop="true"
-    android:layout_alignParentRight="true"
-    android:layout_height="wrap_content"
-    android:layout_marginRight="8dp"
-    android:layout_marginTop="8dp"
-    android:layout_width="wrap_content" />
   <TextView
     android:background="@color/warning_background"
     android:drawableLeft="@android:drawable/ic_dialog_alert"
@@ -47,4 +37,14 @@ limitations under the License.
     android:textColor="@android:color/primary_text_dark"
     android:visibility="gone"
     style="@style/TextMedium.WithIcon" />
+  <ImageButton
+    android:background="@drawable/my_location"
+    android:contentDescription="@string/icon_my_location"
+    android:id="@+id/map_my_location"
+    android:layout_below="@id/map_message"
+    android:layout_alignParentRight="true"
+    android:layout_height="wrap_content"
+    android:layout_marginRight="8dp"
+    android:layout_marginTop="8dp"
+    android:layout_width="wrap_content" />
 </RelativeLayout>

MyTracks/res/values/strings.xml

@@ -377,8 +377,8 @@ limitations under the License.
     Use My Tracks while you run, bike, hike, or do anything else outdoors, and it will use the GPS
     sensor in your phone to record the path you took. It will also gather useful statistics such as
     time, speed, distance, and elevation. You can review all of this data live, or you can save it
-    for use later. While you\'re out, you can mark relevant waypoints, and can ask to hear automatic
-    voice announcements about your progress.\n
+    for use later. While you\'re out, you can insert markers, have split markers inserted
+    automatically, and can ask to hear periodic voice announcements of your progress.\n
     \n
     My Tracks can record data from external sensors:\n
     - Zephyr Technology Consumer HxM Bluetooth heart rate monitor\n
@@ -755,6 +755,14 @@ limitations under the License.
     translation_description="In the 'Help' page, the question on location precision.">
     How precise are the recorded tracks?
   </string>
+  <string name="help_marker_answer"
+    translation_description="In the 'Help' page, the answer on markers.">
+    Markers are used to annotate a location.
+  </string>
+  <string name="help_marker_question"
+    translation_description="In the 'Help' page, the question on markers.">
+    What are markers?
+  </string>
   <string name="help_my_tracks_answer"
     translation_description="In the 'Help' page, the answer on what is My Tracks.">
     My Tracks allows you to record GPS tracks and visualize your hiking, running, biking or any
@@ -793,6 +801,15 @@ limitations under the License.
     translation_description="In the 'Help' page, the question on share visibility.">
     Who can see the tracks I send to Google Maps and Google Fusion Tables?
   </string>
+  <string name="help_split_marker_answer"
+    translation_description="In the 'Help' page, the answer on split markers.">
+    The split markers are used to segment a track to calculate statistics for each segment. Split
+    markers are inserted by setting the split frequency in the menu.
+  </string>
+  <string name="help_split_marker_question"
+    translation_description="In the 'Help' page, the question on split markers.">
+    What are split markers?
+  </string>
   <string name="help_split_track_answer"
     translation_description="In the 'Help' page, the answer on splitting long tracks.">
     Tracks on Google Maps and Google Fusion Tables are limited to certain sizes.
@@ -802,24 +819,6 @@ limitations under the License.
     Why do very long tracks split into multiple segments upon sending them to Google Maps and
     Google Fusion Tables?
   </string>
-  <string name="help_statistics_marker_answer"
-    translation_description="In the 'Help' page, the answer on statistics markers.">
-    Statistics markers are used to segment a track to calculate statistics for each segment. For
-    example, let\'s say you are recording a bike ride up a hill, you can insert a statistics marker
-    at the bottom of the hill and another at the top.
-  </string>
-  <string name="help_statistics_marker_question"
-    translation_description="In the 'Help' page, the question on statistics markers.">
-    What are statistics markers?
-  </string>
-  <string name="help_waypoint_marker_answer"
-    translation_description="In the 'Help' page, the answer on waypoint markers.">
-    Waypoint markers are used to annotate a location.
-  </string>
-  <string name="help_waypoint_marker_question"
-    translation_description="In the 'Help' page, the question on waypoint markers.">
-    What are waypoint markers?
-  </string>
 
   <!-- Icon -->
   <string name="icon_marker"
@@ -967,12 +966,12 @@ limitations under the License.
   </string>
   <string name="marker_detail_statistics_title"
     translation_description="In the marker detail page, the title for the statistics section
-      indicating that the data below are since the last Statistics marker.">
-    Since last Statistics marker:
+      indicating that the data below are since the last split marker.">
+    Since last split marker:
   </string>
   <string name="marker_edit_marker_type"
     translation_description="In the marker edit page, the label for the marker type, including some
-      exmaples.">
+      examples.">
     Marker type (e.g. building, pothole...)
   </string>
   <string name="marker_edit_marker_type_hint"
@@ -998,19 +997,18 @@ limitations under the License.
     translation_description="The message when the marker list is empty.">
     You don\'t have any markers.
   </string>
-  <string name="marker_statistics_name_format"
-    translation_description="When adding a statistics marker, the string format for the default
-      name.
-
-      %1$d: number. E.g., '1'.">
-    Statistics %1$d
-  </string>
   <string name="marker_name_format"
     translation_description="When adding a marker, the string format for the default name.
 
       %1$d: number. E.g., '1'.">
     Marker %1$d
   </string>
+  <string name="marker_split_name_format"
+    translation_description="When adding a split marker, the string format for the default name.
+
+      %1$d: number. E.g., '1'.">
+    Split %1$d
+  </string>
 
   <!-- Menu Items -->
   <string name="menu_aggregated_statistics"
@@ -1516,7 +1514,7 @@ limitations under the License.
     By time
   </string>
   <string name="settings_chart_x_axis"
-    translation_description="In the 'Chart' setttings, the option to change the x axis display,
+    translation_description="In the 'Chart' settings, the option to change the x axis display,
       either by distance or by time.">
     X axis
   </string>
@@ -1976,7 +1974,7 @@ limitations under the License.
     Time measurement
   </string>
   <string name="settings_stats_units_imperial"
-    translation_description="In the 'Stats' setttings, the option to use imperial units, with
+    translation_description="In the 'Stats' settings, the option to use imperial units, with
       examples.">
     Imperial (mi, ft)
   </string>
@@ -2898,10 +2896,10 @@ limitations under the License.
   <string name="welcome_message"
     translation_description="The message of the welcome dialog.">
     Use My Tracks while you run, bike, hike, or do anything outdoor to record your path. While
-    recording, you can visualize your track and watch live statistics. You can also add
-    markers, have markers inserted periodically, or hear automatic voice announcements of
-    your progress. For recorded tracks, you can play them on Google Earth, share with friends, or
-    upload to Google Maps, Google Fusion Tables, or Google Docs.    
+    recording, you can visualize your track and watch live statistics. You can also add markers,
+    have split markers inserted periodically, or hear periodic announcements of your progress.
+    For recorded tracks, you can play them on Google Earth, share with friends, or upload to Google
+    Maps, Google Fusion Tables, or Google Docs.
   </string>
   <string name="welcome_title"
     translation_description="The title of the welcome dialog.">

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

@@ -997,7 +997,7 @@ public class TrackRecordingService extends Service {
     } else {
       int nextMarkerNumber = providerUtils.getNextMarkerNumber(recordingTrackId, true);
       name = nextMarkerNumber == -1 ? getString(R.string.marker_type_statistics)
-          : getString(R.string.marker_statistics_name_format, nextMarkerNumber);
+          : getString(R.string.marker_split_name_format, nextMarkerNumber);
     }
     waypoint.setName(name);
     waypoint.setStatistics(waypointStatsBuilder.getStatistics());

MyTracksTest/src/com/google/android/apps/mytracks/services/TrackRecordingServiceTest.java

@@ -502,7 +502,7 @@ public class TrackRecordingServiceTest extends ServiceTestCase<TestRecordingServ
 
     Waypoint wpt = providerUtils.getWaypoint(2);
     assertEquals(getContext().getString(R.string.marker_statistics_icon_url), wpt.getIcon());
-    assertEquals(getContext().getString(R.string.marker_statistics_name_format, 1), wpt.getName());
+    assertEquals(getContext().getString(R.string.marker_split_name_format, 1), wpt.getName());
     assertEquals(Waypoint.TYPE_STATISTICS, wpt.getType());
     assertEquals(123L, wpt.getTrackId());
     assertEquals(0.0, wpt.getLength());