Allow users to insert only waypoint markers.

MyTracks/res/layout/marker_add.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2012 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-  style="@style/ScrollView" >
-  <RelativeLayout
-    android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
-    android:padding="8dp" >
-    <RadioGroup
-      android:id="@+id/marker_add_type"
-      android:layout_alignParentLeft="true"
-      android:layout_alignParentTop="true"
-      android:layout_height="wrap_content"
-      android:layout_width="wrap_content" >
-      <RadioButton
-        android:id="@+id/marker_add_statistics"
-        android:text="@string/marker_statistics"
-        style="@style/TextMedium" />
-      <RadioButton
-        android:id="@+id/marker_add_waypoint"
-        android:text="@string/marker_waypoint"
-        style="@style/TextMedium" />
-    </RadioGroup>
-    <Button
-      android:id="@+id/marker_add_more_options"
-      android:layout_alignParentBottom="true"
-      android:layout_alignParentRight="true"
-      android:layout_height="wrap_content"
-      android:layout_width="wrap_content"
-      android:text="@string/generic_more_options" />
-  </RelativeLayout>
-</ScrollView>

MyTracks/res/layout/marker_edit.xml

@@ -24,28 +24,6 @@ limitations under the License.
       android:layout_width="fill_parent"
       android:orientation="vertical"
       android:padding="8dp" >
-      <LinearLayout
-        android:id="@+id/marker_edit_type_section"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:orientation="vertical" >
-        <TextView
-          android:text="@string/marker_type"
-          style="@style/EditLabel" />
-        <RadioGroup
-          android:id="@+id/marker_edit_type"
-          android:layout_height="wrap_content"
-          android:layout_width="wrap_content" >
-          <RadioButton
-            android:id="@+id/marker_edit_statistics"
-            android:text="@string/marker_statistics"
-            style="@style/TextMedium" />
-          <RadioButton
-            android:id="@+id/marker_edit_waypoint"
-            android:text="@string/marker_waypoint"
-            style="@style/TextMedium" />
-        </RadioGroup>
-      </LinearLayout>
       <TextView
         android:text="@string/generic_name"
         style="@style/EditLabel" />
@@ -73,10 +51,10 @@ limitations under the License.
           android:imeOptions="actionNext"
           style="@style/EditName" />
         <TextView
-          android:text="@string/marker_edit_waypoint_marker_type"
+          android:text="@string/marker_edit_marker_type"
           style="@style/EditLabel.WithPaddingTop" />
         <AutoCompleteTextView
-          android:hint="@string/marker_edit_waypoint_marker_type_hint"
+          android:hint="@string/marker_edit_marker_type_hint"
           android:id="@+id/marker_edit_waypoint_marker_type"
           android:imeOptions="actionNext"
           style="@style/EditCategory" />

MyTracks/res/values/keys.xml

@@ -39,7 +39,6 @@ limitations under the License.
   <string name="min_recording_interval_key">minRecordingInterval</string>
   <string name="min_required_accuracy_key">minRequiredAccuracy</string>
   <string name="pick_existing_map_key">pickExistingMap</string>
-  <string name="pick_statistics_marker_key">pickStatisticsMarker</string>
   <string name="preferred_account_key">preferredAccount</string>
   <string name="recording_track_id_key">recordingTrackId</string>
   <string name="report_speed_key">reportSpeed</string>

MyTracks/res/values/strings.xml

@@ -634,10 +634,6 @@ limitations under the License.
     translation_description="The title on an alert dialog indicating error.">
     Error
   </string>
-  <string name="generic_more_options"
-    translation_description="The text on a button to say more options.">
-    More options
-  </string>  
   <string name="generic_name"
     translation_description="The text label for entering a name.">
     Name
@@ -953,29 +949,29 @@ limitations under the License.
   <string name="marker_detail_name"
     translation_description="In the marker detail page, the label for the marker name.
 
-      %1$s marker name. E.g., 'Waypoint 1'.">
+      %1$s marker name. E.g., 'Marker 1'.">
     Name: %1$s
   </string>  
-  <string name="marker_detail_waypoint_description"
-    translation_description="In the marker detail page, the label for the waypoint description.
+  <string name="marker_detail_description"
+    translation_description="In the marker detail page, the label for the description.
 
       %1$s marker description. E.g., 'At the top'.">
     Description: %1$s
   </string>  
-  <string name="marker_detail_waypoint_marker_type"
-    translation_description="In the marker detail page, the label for the waypoint marker type.
+  <string name="marker_detail_marker_type"
+    translation_description="In the marker detail page, the label for the marker type.
 
       %1$s marker type. E.g., 'building'.">
     Marker type: %1$s
   </string>  
-  <string name="marker_edit_waypoint_marker_type"
-    translation_description="In the marker edit page, the label for the waypoint marker type,
-      including some exmaples.">
+  <string name="marker_edit_marker_type"
+    translation_description="In the marker edit page, the label for the marker type, including some
+      exmaples.">
     Marker type (e.g. building, pothole...)
   </string>
-  <string name="marker_edit_waypoint_marker_type_hint"
-    translation_description="In the marker edit page, the hint in the waypoint marker type text
-      field when it is empty.">
+  <string name="marker_edit_marker_type_hint"
+    translation_description="In the marker edit page, the hint in the marker type text field when it
+      is empty.">
     Marker type
   </string> 
   <string name="marker_label_end"
@@ -996,10 +992,6 @@ 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"
-    translation_description="The label to add a statistics marker.">
-    Statistics
-  </string>
   <string name="marker_statistics_name_format"
     translation_description="When adding a statistics marker, the string format for the default
       name.
@@ -1007,20 +999,11 @@ limitations under the License.
       %1$d: number. E.g., '1'.">
     Statistics %1$d
   </string>
-  <string name="marker_type"
-    translation_description="When adding a marker, the label to select a type, statistics or
-      waypoint.">
-    Type
-  </string>
-  <string name="marker_waypoint"
-    translation_description="The label to add a waypoint marker.">
-    Waypoint
-  </string>
-  <string name="marker_waypoint_name_format"
-    translation_description="When adding a waypoint marker, the string format for the default name.
+  <string name="marker_name_format"
+    translation_description="When adding a marker, the string format for the default name.
 
       %1$d: number. E.g., '1'.">
-    Waypoint %1$d
+    Marker %1$d
   </string>
       
   <!-- Menu Items -->
@@ -1090,7 +1073,7 @@ limitations under the License.
     Save as %1$s
   </string>
   <string name="menu_search"
-    translation_description="In the menu, to start a textual search for tracks or waypoints.">
+    translation_description="In the menu, to start a textual search for tracks or markers.">
     Search
   </string>
   <string name="menu_send_google"