Code cleanup. Rename My Maps to Maps.

Did a case insentive search and replacement for
mymap
my_map
my map

MyTracks/res/layout/list.xml

@@ -31,7 +31,7 @@ limitations under the License.
       android:layout_height="wrap_content"
       android:textSize="16dip"
       android:textColor="#fff"
-      android:text="@string/my_maps_list_pick_map"
+      android:text="@string/maps_list_pick_map"
       android:layout_weight="0"/>
   </LinearLayout>
   <ListView android:id="@+id/maplist"
@@ -47,7 +47,7 @@ limitations under the License.
       android:textSize="16dip"
       android:textColor="#c00"
       android:textStyle="bold"
-      android:text="@string/my_maps_list_no_maps"
+      android:text="@string/maps_list_no_maps"
       android:visibility="gone"/>
     <TextView android:id="@+id/failed"
     android:layout_width="fill_parent"
@@ -58,7 +58,7 @@ limitations under the License.
     android:textSize="16dip"
     android:textColor="#c00"
     android:textStyle="bold"
-    android:text="@string/my_maps_list_error"
+    android:text="@string/maps_list_error"
     android:visibility="gone"/>
     <LinearLayout
     android:orientation="horizontal"
@@ -89,7 +89,7 @@ limitations under the License.
           android:textSize="16dip"
           android:textColor="#fff"
           android:textStyle="bold"
-          android:text="@string/my_maps_list_loading"/>
+          android:text="@string/maps_list_loading"/>
         <TextView
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"

MyTracks/res/layout/mytracks_send_to_google.xml

@@ -39,11 +39,11 @@ limitations under the License.
       <!-- Google Maps -->
       <TableRow android:id="@+id/send_google_maps_row">
         <ImageView
-          android:src="@drawable/mymaps_icon"
+          android:src="@drawable/maps_icon"
           style="@style/SendGoogleImageView"/>
         <CheckBox
-          android:id="@+id/send_google_my_maps"
-          android:text="@string/send_google_my_maps"
+          android:id="@+id/send_google_maps"
+          android:text="@string/send_google_maps"
           style="@style/SendGoogleCheckBox"/>
       </TableRow>
       <TableRow android:id="@+id/send_google_maps_option_row">

MyTracks/res/layout/welcome.xml

@@ -130,10 +130,10 @@ limitations under the License.
         android:text="@string/welcome_delete_all_answer"
         style="@style/WelcomeTextView"/>     
       <TextView
-        android:text="@string/welcome_my_maps_sharing_question"
+        android:text="@string/welcome_maps_sharing_question"
         style="@style/WelcomeTextView.Question"/>
       <TextView
-        android:text="@string/welcome_my_maps_sharing_answer"
+        android:text="@string/welcome_maps_sharing_answer"
         style="@style/WelcomeTextView"/>    
     </LinearLayout>
   </ScrollView>

MyTracks/res/values/do_not_translate.xml

@@ -43,7 +43,7 @@ limitations under the License.
   </string>
   <string name="send_google_docs_url">docs.google.com</string>
   <string name="send_google_fusion_tables_url">google.com/fusiontables</string>
-  <string name="send_google_my_maps_url">maps.google.com</string>
+  <string name="send_google_maps_url">maps.google.com</string>
   <string name="sensor_type_value_ant">ANT</string>    
   <string name="sensor_type_value_none">NONE</string>
   <string name="sensor_type_value_polar">POLAR</string>

MyTracks/res/values/keys.xml

@@ -34,7 +34,7 @@ limitations under the License.
   <string name="report_speed_key">reportSpeed</string>
   <string name="send_to_docs_key">sendToDocs</string>
   <string name="send_to_fusion_tables_key">sendToFusionTables</string>
-  <string name="send_to_my_maps_key">sendToMyMaps</string>
+  <string name="send_to_maps_key">sendToMaps</string>
   <string name="sensor_type_key">sensorType</string>
   <string name="share_url_only_key">shareUrlOnly</string>
   <string name="split_frequency_key">splitFrequency</string>

MyTracks/res/values/strings.xml

@@ -820,6 +820,43 @@ limitations under the License.
     Waypoint
   </string>
 
+  <!-- Maps List -->
+  <string name="maps_list_error"
+    translation_description="When sending a track to an existing Google Map, the text on the
+      'Maps' list page informing the user that his maps cannot be loaded at this time.">
+    Your maps could not be loaded at this time.
+  </string>
+  <string name="maps_list_loading"
+    translation_description="When sending a track to an existing Google Map, the progress dialog
+      message informing the user that his maps are being loaded.">
+    Loading maps...
+  </string>
+  <string name="maps_list_no_maps"
+    translation_description="When sending a track to an existing Google Map, the text on the
+      'Maps' list page informing the user that he doesn't have any maps.">
+    You don\'t have any maps.
+  </string>
+  <string name="maps_list_pick_map"
+    translation_description="When sending a track to an existing Google Map, the text on the
+      'Maps' list page asking the user to pick one of his maps.">
+    Pick a map:
+  </string>
+  <string name="maps_list_public_label"
+    translation_description="When sending a track to an existing Google Map, in the 'Maps'
+      list page, the label next to the maps that are public, as opposed to being unlisted.">
+    Public
+  </string>
+  <string name="maps_list_title"
+    translation_description="When sending a track to an existing Google Map, the title of the
+      page listing the user's maps in Google Maps.">
+    Your Google Maps
+  </string>
+  <string name="maps_list_unlisted_label"
+    translation_description="When sending a track to an existing Google Map, in the 'Maps'
+      list page, the label next to the maps that are unlisted, as opposed to being public.">
+    Unlisted
+  </string>
+  
   <!-- Menu Items -->
   <string name="menu_aggregated_statistics"
     translation_description="In the menu, to go to the aggregated statistics page.
@@ -912,53 +949,6 @@ limitations under the License.
     \'Location &amp; security\' settings) &amp; make sure the sky is visible. Try again later.
   </string>
 
-  <!-- Maps List -->
-  <string name="my_maps_list_error"
-    translation_description="When sending a track to an existing Google Map, the text on the
-      'Maps' list page informing the user that his maps cannot be loaded at this time.">
-    Your maps could not be loaded at this time.
-  </string>
-  <string name="my_maps_list_loading"
-    translation_description="When sending a track to an existing Google Map, the progress dialog
-      message informing the user that his maps are being loaded.">
-    Loading maps...
-  </string>
-  <string name="my_maps_list_no_maps"
-    translation_description="When sending a track to an existing Google Map, the text on the
-      'Maps' list page informing the user that he doesn't have any maps.
-
-      Screenshot: my_maps_list_no_maps.png">
-    You don\'t have any maps.
-  </string>
-  <string name="my_maps_list_pick_map"
-    translation_description="When sending a track to an existing Google Map, the text on the
-      'Maps' list page asking the user to pick one of his maps.
-
-      Screenshot: my_maps.png">
-    Pick a map:
-  </string>
-  <string name="my_maps_list_public_label"
-    translation_description="When sending a track to an existing Google Map, in the 'Maps'
-      list page, the label next to the maps that are public, as opposed to being unlisted.
-
-      Screenshot: my_maps.png">
-    Public
-  </string>
-  <string name="my_maps_list_title"
-    translation_description="When sending a track to an existing Google Map, the title of the
-      page listing the user's maps in Google Maps.
-
-      Screenshot: my_maps.png">
-    Your Google Maps
-  </string>
-  <string name="my_maps_list_unlisted_label"
-    translation_description="When sending a track to an existing Google Map, in the 'Maps'
-      list page, the label next to the maps that are unlisted, as opposed to being public.
-
-      Screenshot: my_maps.png">
-    Unlisted
-  </string>
-
   <!-- My Tracks -->
   <string name="my_tracks_app_name"
     translation_description="The My Tracks application name.">
@@ -1139,7 +1129,7 @@ limitations under the License.
       Screenshot: send_google_choose_service.png">
     Google Fusion Tables
   </string>
-  <string name="send_google_my_maps"
+  <string name="send_google_maps"
     translation_description="When sending a track to Google, under the 'Send to...' dialog, the
       checkbox option to send to Google Maps.
 
@@ -3196,7 +3186,7 @@ limitations under the License.
       Screenshot: welcome.png">
     How precise are the recorded tracks?
   </string>
-  <string name="welcome_my_maps_sharing_answer"
+  <string name="welcome_maps_sharing_answer"
     translation_description="In the 'Welcome' page, the help content answer on Google Maps
       visibility.
 
@@ -3205,7 +3195,7 @@ limitations under the License.
     -> Make new maps public. You can change the visibility of all your maps at My places in Google
     Maps.
   </string>
-  <string name="welcome_my_maps_sharing_question"
+  <string name="welcome_maps_sharing_question"
     translation_description="In the 'Welcome' page, the help content question on Google Maps
       visibility.