Update to map view v2.

MyTracks/res/layout/map.xml

@@ -15,17 +15,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/map_container"
   android:layout_height="fill_parent"
   android:layout_width="fill_parent" >
-  <!-- apiKey corresponds to certificate md5: 81:DF:A2:63:53:C7:6B:1E:6C:24:62:D4:91:1C:36:3A -->
-  <com.google.android.maps.MapView
-    android:apiKey="0TXoRmxTinrZKQ9JSazj-9A34XX6_lXsRvTpXWA"
-    android:clickable="true"
-    android:focusable="true"
-    android:focusableInTouchMode="true"
-    android:id="@+id/map_view"
-    android:layout_height="fill_parent"
-    android:layout_width="fill_parent" />
   <TextView
     android:background="@color/warning_background"
     android:drawableLeft="@drawable/warning"
@@ -41,8 +33,8 @@ limitations under the License.
     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_below="@id/map_message"
     android:layout_height="wrap_content"
     android:layout_marginRight="8dp"
     android:layout_marginTop="8dp"

MyTracks/res/menu/map.xml

@@ -16,8 +16,20 @@ limitations under the License.
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
   <item
-    android:icon="@drawable/menu_satellite_mode"
-    android:id="@+id/map_satellite_mode"
+    android:icon="@drawable/menu_map_layer"
     android:orderInCategory="5"
-    android:showAsAction="ifRoom"/>
+    android:showAsAction="ifRoom"
+    android:title="@string/menu_map_layer">
+    <menu>
+      <item
+        android:id="@+id/menu_map"
+        android:title="@string/menu_map"/>
+      <item
+        android:id="@+id/menu_satellite"
+        android:title="@string/menu_satellite"/>
+      <item
+        android:id="@+id/menu_terrain"
+        android:title="@string/menu_terrain"/>
+    </menu>
+  </item>
 </menu>

MyTracks/res/values/colors.xml

@@ -16,7 +16,6 @@ limitations under the License.
 -->
 <resources>
   <color name="black">#FF000000</color>
-  <color name="blue">#FF0000FF</color>
   <color name="gray">#FF444444</color>
   <color name="orange">#FFFAAD2C</color>
   <color name="red">#FFBE161B</color>

MyTracks/res/values/strings.xml

@@ -1157,11 +1157,18 @@ limitations under the License.
       Character limit: ~20 (1 line)">
     Insert marker
   </string>
-  <string name="menu_map_mode"
-    translation_description="In the menu, to switch the display to the map mode.
+  <string name="menu_map"
+    translation_description="In the menu, under the map layer option, the submenu to display normal
+      map.
 
       Character limit: ~20 (1 line)">
-    Map mode
+    Map
+  </string>
+  <string name="menu_map_layer"
+    translation_description="In the menu, to change the map layer.
+
+      Character limit: ~20 (1 line)">
+    Map layer
   </string>
   <string name="menu_markers"
     translation_description="In the menu, to show a list of markers for the current track.
@@ -1175,8 +1182,9 @@ limitations under the License.
       Character limit: ~20 (1 line)">
     Play
   </string>
-  <string name="menu_satellite_mode"
-    translation_description="In the menu, to switch the display to the satellite mode.
+  <string name="menu_satellite"
+    translation_description="In the menu, under the map layer option, the submenu to display
+      satellite.
 
       Character limit: ~20 (1 line)">
     Satellite
@@ -1256,6 +1264,13 @@ limitations under the License.
       Character limit: ~20 (1 line)">
     Stop GPS
   </string>
+  <string name="menu_terrain"
+    translation_description="In the menu, under the map layer option, the submenu to display
+      terrain.
+
+      Character limit: ~20 (1 line)">
+    Terrain
+  </string>
   <string name="menu_voice_frequency"
     translation_description="In the menu, to configure the voice frequency, how frequent to announce
       status.
@@ -2298,7 +2313,7 @@ limitations under the License.
     translation_description="Title of the page to configure the My Tracks widget items.">
     Configure Widget Items
   </string>
-  
+
   <!-- Unit -->
   <string name="unit_feet"
     translation_description="Abbreviation for feet. E.g., '2 ft'.">