improve map view v2 comments

MyTracks/.classpath

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

MyTracks/.project

@@ -3,7 +3,7 @@
 	<name>MyTracks</name>
 	<comment></comment>
 	<projects>
-		<project>MyTracksLib</project>
+		<project>MyTracks</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

MyTracks/AndroidManifest.xml

@@ -16,10 +16,9 @@ limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   android:installLocation="auto"
-  android:versionCode="56"
-  android:versionName="2.0.2"
+  android:versionCode="63"
+  android:versionName="2.0.3"
   package="com.google.android.maps.mytracks" >
-
   <!-- Permission to initialize services -->
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
   <!-- Permissions to record locations -->
@@ -42,6 +41,7 @@ limitations under the License.
   <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.local" />
   <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.wise" />
   <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.writely" />
+  <!-- Permission to access Google services to communicate with the map servers. -->
   <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
   <!-- Permission to read phone state so voice announcement will not interrupt ongoing calls -->
   <uses-permission android:name="android.permission.READ_PHONE_STATE" />
@@ -79,11 +79,18 @@ limitations under the License.
     android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA"
     android:permissionGroup="android.permission-group.LOCATION"
     android:protectionLevel="dangerous" />
-
+  <!-- Permission for map view v2. Note the prefix must be the application package name -->
+  <permission
+    android:name="com.google.android.maps.mytracks.permission.MAPS_RECEIVE"
+    android:protectionLevel="signature" />
+  <uses-permission android:name="com.google.android.maps.mytracks.permission.MAPS_RECEIVE" />
   <uses-sdk
-    android:minSdkVersion="7"
+    android:minSdkVersion="8"
     android:targetSdkVersion="16" />
   <!-- Required features -->
+  <uses-feature
+    android:glEsVersion="0x00020000"
+    android:required="true" />
   <uses-feature
     android:name="android.hardware.location"
     android:required="true" />
@@ -115,26 +122,27 @@ limitations under the License.
   <uses-feature
     android:name="android.hardware.touchscreen.multitouch"
     android:required="false" />
-
   <supports-screens
     android:anyDensity="true"
     android:largeScreens="true"
     android:normalScreens="true"
     android:smallScreens="true"
     android:xlargeScreens="true" />
-
   <application
     android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent"
-    android:icon="@drawable/my_tracks_icon"
     android:hardwareAccelerated="true"
+    android:icon="@drawable/my_tracks_icon"
     android:label="@string/my_tracks_app_name"
     android:name="com.google.android.apps.mytracks.MyTracksApplication"
     android:theme="@style/ThemeSelector" >
-
     <!-- For data backup -->
     <meta-data
       android:name="com.google.android.backup.api_key"
       android:value="AEdPqrEAAAAIi-_QiwoRSc9_bAC9cmuNXTQyU8ajJmGtKdhskQ" />
+    <!-- For map view v2 -->
+    <meta-data
+      android:name="com.google.android.maps.v2.API_KEY"
+      android:value="AIzaSyCKg_WrcnfP0I105X1CGHoiJsxT7w45XEI" />
     <!-- Activities -->
     <activity
       android:label="@string/menu_aggregated_statistics"
@@ -142,15 +150,12 @@ limitations under the License.
     <activity
       android:label="@string/menu_help"
       android:name="com.google.android.apps.mytracks.HelpActivity" />
-    <activity
-      android:name="com.google.android.apps.mytracks.ImportActivity" >
+    <activity android:name="com.google.android.apps.mytracks.ImportActivity" >
       <intent-filter>
         <action android:name="android.intent.action.ATTACH_DATA" />
         <action android:name="android.intent.action.VIEW" />
-
         <category android:name="android.intent.category.BROWSABLE" />
         <category android:name="android.intent.category.DEFAULT" />
-
         <data android:mimeType="application/gpx" />
         <data android:mimeType="application/gpx+xml" />
         <data android:mimeType="application/vnd.google-earth.gpx" />
@@ -158,8 +163,7 @@ limitations under the License.
         <data android:scheme="file" />
       </intent-filter>
     </activity>
-    <activity
-      android:name="com.google.android.apps.mytracks.MarkerEditActivity" />
+    <activity android:name="com.google.android.apps.mytracks.MarkerEditActivity" />
     <activity android:name="com.google.android.apps.mytracks.MarkerDetailActivity" />
     <activity android:name="com.google.android.apps.mytracks.MarkerListActivity" >
       <meta-data
@@ -172,7 +176,6 @@ limitations under the License.
       <intent-filter>
         <action android:name="android.intent.action.SEARCH" />
       </intent-filter>
-
       <meta-data
         android:name="android.app.searchable"
         android:resource="@xml/search" />
@@ -181,15 +184,12 @@ limitations under the License.
       android:label="@string/menu_sensor_state"
       android:name="com.google.android.apps.mytracks.SensorStateActivity" />
     <activity android:name="com.google.android.apps.mytracks.TrackDetailActivity" />
-    <activity
-      android:name="com.google.android.apps.mytracks.TrackEditActivity" />
+    <activity android:name="com.google.android.apps.mytracks.TrackEditActivity" />
     <activity android:name="com.google.android.apps.mytracks.TrackListActivity" >
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
-
         <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
-
       <meta-data
         android:name="android.app.default_searchable"
         android:value="com.google.android.apps.mytracks.SearchListActivity" />
@@ -215,6 +215,13 @@ limitations under the License.
     <activity android:name="com.google.android.apps.mytracks.settings.SettingsActivity" />
     <activity android:name="com.google.android.apps.mytracks.settings.SharingSettingsActivity" />
     <activity android:name="com.google.android.apps.mytracks.settings.StatsSettingsActivity" />
+    <activity
+      android:label="@string/track_widget_config_title"
+      android:name="com.google.android.apps.mytracks.widgets.TrackWidgetConfigActivity" >
+      <intent-filter>
+        <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
+      </intent-filter>
+    </activity>
     <!-- Services -->
     <service
       android:exported="false"
@@ -259,8 +266,5 @@ limitations under the License.
       android:authorities="com.google.android.maps.mytracks.search"
       android:exported="false"
       android:name="com.google.android.apps.mytracks.content.SearchEngineProvider" />
-
-    <uses-library android:name="com.google.android.maps" />
   </application>
-
 </manifest>

MyTracks/libs/README.txt

@@ -4,8 +4,7 @@ applications that wish to use these files should consult the appropriate
 licenses or the JAR's authors.
 
 Android Support Package:
-android-support-v4-r7-googlemaps.jar
-- see https://github.com/petedoyle/android-support-v4-googlemaps
+android-support-v4.jar
 
 Ant+:
 antlib.jar - see http://www.thisisant.com/pages/developer-zone/android-api

MyTracks/proguard.cfg

@@ -86,6 +86,17 @@
 # See https://groups.google.com/forum/#!topic/guava-discuss/YCZzeCiIVoI
 -dontwarn com.google.common.collect.MinMaxPriorityQueue
 
+# For Google Play Services
+-keep class * extends java.util.ListResourceBundle {
+    protected Object[][] getContents();
+}
+
+# For Google Maps API library
+-keepclassmembers class * implements java.io.Serializable {
+    private static final long serialVersionUID;
+}
+-keep public class com.google.googlenav.capabilities.CapabilitiesController*
+
 # 
 # Section 3
 # My Tracks specific proguard settings.

MyTracks/project.properties

@@ -11,5 +11,6 @@
 split.density=false
 proguard.config=proguard.cfg
 # Project target.
-target=Google Inc.:Google APIs:16
+target=android-16
 android.library.reference.1=../MyTracksLib
+android.library.reference.2=../google-play-services_lib

MyTracks/res/layout-v14/bottom_buttons.xml

@@ -0,0 +1,28 @@
+<?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.
+-->
+<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+  <Button
+    android:id="@+id/bottom_buttons_cancel"
+    android:layout_gravity="left"
+    android:text="@string/generic_cancel"
+    style="@style/BottomButton" />
+  <Button
+    android:id="@+id/bottom_buttons_add"
+    android:layout_gravity="right"
+    android:text="@string/generic_add"
+    style="@style/BottomButton" />
+</merge>

MyTracks/res/layout/about.xml

@@ -18,7 +18,7 @@ limitations under the License.
   style="@style/ScrollView" >
   <LinearLayout
     android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:orientation="vertical"
     android:padding="8dp" >
     <TextView

MyTracks/res/layout/aggregated_stats.xml

@@ -18,7 +18,7 @@ limitations under the License.
   style="@style/ScrollView">
   <TableLayout
     android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:padding="8dp"
     android:shrinkColumns="0,2"
     android:stretchColumns="0,2" >

MyTracks/res/layout/bottom_buttons.xml

@@ -0,0 +1,28 @@
+<?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.
+-->
+<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+  <Button
+    android:id="@+id/bottom_buttons_add"
+    android:layout_gravity="left"
+    android:text="@string/generic_add"
+    style="@style/BottomButton" />
+  <Button
+    android:id="@+id/bottom_buttons_cancel"
+    android:layout_gravity="right"
+    android:text="@string/generic_cancel"
+    style="@style/BottomButton" />
+</merge>

MyTracks/res/layout/chart.xml

@@ -15,14 +15,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
+  android:layout_height="match_parent"
+  android:layout_width="match_parent"
   android:orientation="vertical" >
   <LinearLayout
     android:id="@+id/chart_view_layout"
     android:layout_height="0dp"
     android:layout_weight="1"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:orientation="vertical" >
   </LinearLayout>
   <ZoomControls
@@ -30,6 +30,6 @@ limitations under the License.
     android:gravity="right"
     android:id="@+id/chart_zoom_controls"
     android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:paddingRight="8dp" />
 </LinearLayout>

MyTracks/res/layout/choose_activity_list_item.xml

@@ -17,7 +17,7 @@ limitations under the License.
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:gravity="center_vertical"
   android:layout_height="wrap_content"
-  android:layout_width="fill_parent"
+  android:layout_width="match_parent"
   android:minHeight="?android:attr/listPreferredItemHeight"
   android:orientation="horizontal"
   android:paddingLeft="16dp"

MyTracks/res/layout/choose_map.xml

@@ -15,12 +15,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent" >
+  android:layout_height="match_parent"
+  android:layout_width="match_parent" >
   <ListView
     android:id="@+id/choose_map_list_view"
-    android:layout_height="fill_parent"
-    android:layout_width="fill_parent" />
+    android:layout_height="match_parent"
+    android:layout_width="match_parent" />
   <TextView
     android:id="@+id/choose_map_empty_view"
     style="@style/ListEmptyTextView" >

MyTracks/res/layout/choose_map_item.xml

@@ -17,7 +17,7 @@ limitations under the License.
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:gravity="center_vertical"
   android:layout_height="wrap_content"
-  android:layout_width="fill_parent"
+  android:layout_width="match_parent"
   android:minHeight="?android:attr/listPreferredItemHeight"
   android:orientation="vertical"
   android:padding="8dp" >

MyTracks/res/layout/choose_upload_service.xml

@@ -18,7 +18,7 @@ limitations under the License.
   style="@style/ScrollView" >
   <TableLayout
     android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:padding="8dp"
     android:stretchColumns="1" >
     <TableRow>

MyTracks/res/layout/confirm_dialog.xml

@@ -18,21 +18,21 @@ limitations under the License.
   style="@style/ScrollView" >
   <LinearLayout
     android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:orientation="vertical"
     android:paddingBottom="12dp"
     android:paddingLeft="14dp"
     android:paddingRight="10dp"
     android:paddingTop="2dp" >
     <TextView
-      android:id="@+id/confirm_sharing_text_view"
       android:autoLink="web"
+      android:id="@+id/confirm_dialog_message"
       style="@style/TextMedium" />
     <CheckBox
-      android:id="@+id/confirm_sharing_check_box"
+      android:id="@+id/confirm_dialog_check_box"
       android:layout_height="wrap_content"
       android:layout_marginTop="8dp"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:text="@string/generic_do_not_show_again"
       style="@style/TextMedium" />
   </LinearLayout>

MyTracks/res/layout/help.xml

@@ -15,13 +15,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
+  android:layout_height="match_parent"
+  android:layout_width="match_parent"
   android:orientation="vertical" >
   <ScrollView style="@style/ScrollView.WithBottomButtons" >
     <LinearLayout
       android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:orientation="vertical"
       android:padding="8dp" >
       <ImageView
@@ -102,6 +102,12 @@ limitations under the License.
       <TextView
         android:text="@string/help_saved_files_answer"
         style="@style/HelpAnswer" />
+      <TextView
+        android:text="@string/help_external_storage_access_question"
+        style="@style/HelpQuestion" />
+      <TextView
+        android:text="@string/help_external_storage_access_answer"
+        style="@style/HelpAnswer" />
       <TextView
         android:text="@string/help_marker_question"
         style="@style/HelpQuestion" />

MyTracks/res/layout/list_item.xml

@@ -17,7 +17,7 @@ limitations under the License.
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   android:gravity="center_vertical"
   android:layout_height="wrap_content"
-  android:layout_width="fill_parent"
+  android:layout_width="match_parent"
   android:minHeight="?android:attr/listPreferredItemHeight"
   android:orientation="horizontal"
   android:padding="8dp" >
@@ -29,11 +29,11 @@ limitations under the License.
   <LinearLayout
     android:layout_height="wrap_content"
     android:layout_marginLeft="8dp"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:orientation="vertical" >
     <LinearLayout
       android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:orientation="horizontal" >
       <TextView
         android:id="@+id/list_item_name"
@@ -47,7 +47,7 @@ limitations under the License.
     </LinearLayout>
     <LinearLayout
       android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:orientation="horizontal" >
       <TextView
         android:id="@+id/list_item_total_time"

MyTracks/res/layout/map.xml

@@ -15,25 +15,18 @@ 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: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" />
+  android:id="@+id/map_container"
+  android:layout_height="match_parent"
+  android:layout_width="match_parent" >
   <TextView
     android:background="@color/warning_background"
     android:drawableLeft="@drawable/warning"
     android:gravity="center"
     android:id="@+id/map_message"
     android:layout_alignParentTop="true"
-    android:layout_width="fill_parent"
-    android:padding="8dp"
+    android:layout_width="match_parent"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
     android:textColor="@android:color/primary_text_dark"
     android:visibility="gone"
     style="@style/TextMedium.WithIcon" />
@@ -41,8 +34,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_alignParentTop="true"
     android:layout_height="wrap_content"
     android:layout_marginRight="8dp"
     android:layout_marginTop="8dp"

MyTracks/res/layout/marker_detail.xml

@@ -18,7 +18,7 @@ limitations under the License.
   style="@style/ScrollView" >
   <LinearLayout
     android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:orientation="vertical"
     android:padding="8dp" >
     <TextView
@@ -27,7 +27,7 @@ limitations under the License.
     <LinearLayout
       android:id="@+id/marker_detail_waypoint_section"
       android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:orientation="vertical" >
       <TextView
         android:id="@+id/marker_detail_waypoint_marker_type"
@@ -39,14 +39,14 @@ limitations under the License.
     <LinearLayout
       android:id="@+id/marker_detail_statistics_section"
       android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:orientation="vertical" >
       <TextView
         android:text="@string/marker_detail_statistics_title"
         style="@style/TextLarge.WithTopMargin" />
       <TableLayout
         android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:paddingTop="8dp"
         android:shrinkColumns="0,2"
         android:stretchColumns="0,2" >

MyTracks/res/layout/marker_edit.xml

@@ -15,13 +15,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
+  android:layout_height="match_parent"
+  android:layout_width="match_parent"
   android:orientation="vertical" >
   <ScrollView style="@style/ScrollView.WithBottomButtons" >
     <LinearLayout
       android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:orientation="vertical"
       android:padding="8dp" >
       <TextView
@@ -30,7 +30,7 @@ limitations under the License.
       <LinearLayout
         android:id="@+id/marker_edit_statistics_section"
         android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:orientation="vertical" >
         <EditText
           android:drawableLeft="@drawable/yellow_pushpin"
@@ -42,7 +42,7 @@ limitations under the License.
       <LinearLayout
         android:id="@+id/marker_edit_waypoint_section"
         android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:orientation="vertical" >
         <EditText
           android:drawableLeft="@drawable/blue_pushpin"

MyTracks/res/layout/marker_list.xml

@@ -15,12 +15,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent" >
+  android:layout_height="match_parent"
+  android:layout_width="match_parent" >
   <ListView
     android:id="@+id/marker_list"
-    android:layout_height="fill_parent"
-    android:layout_width="fill_parent" />
+    android:layout_height="match_parent"
+    android:layout_width="match_parent" />
   <TextView
     android:id="@+id/marker_list_empty"
     android:text="@string/marker_list_empty_message"

MyTracks/res/layout/search_list.xml

@@ -15,12 +15,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent" >
+  android:layout_height="match_parent"
+  android:layout_width="match_parent" >
   <ListView
     android:id="@+id/search_list"
-    android:layout_height="fill_parent"
-    android:layout_width="fill_parent" />
+    android:layout_height="match_parent"
+    android:layout_width="match_parent" />
   <TextView
     android:id="@+id/search_list_empty"
     android:text="@string/search_list_empty_message"

MyTracks/res/layout/sensor_state.xml

@@ -18,7 +18,7 @@ limitations under the License.
   style="@style/ScrollView" >
   <LinearLayout
     android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:orientation="vertical"
     android:padding="8dp" >
     <TextView

MyTracks/res/layout/stats.xml

@@ -18,7 +18,7 @@ limitations under the License.
   style="@style/ScrollView" >
   <TableLayout
     android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:padding="8dp"
     android:shrinkColumns="0,2"
     android:stretchColumns="0,2" >

MyTracks/res/layout/stats_core.xml

@@ -18,12 +18,12 @@ limitations under the License.
   <!-- Total distance -->
   <TableRow>
     <TextView
-      android:text="@string/stats_total_distance"
+      android:text="@string/stats_distance"
       style="@style/StatsLabel" />
   </TableRow>
   <TableRow>
     <TextView
-      android:id="@+id/stats_total_distance_value"
+      android:id="@+id/stats_distance_value"
       style="@style/StatsValue" />
   </TableRow>
   <!-- Total time/moving time -->

MyTracks/res/layout/track_controller.xml

@@ -18,12 +18,12 @@ limitations under the License.
   <LinearLayout
     android:background="@color/black"
     android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:orientation="horizontal"
     android:paddingBottom="8dp"
     android:paddingTop="8dp" >
     <View
-      android:layout_height="fill_parent"
+      android:layout_height="match_parent"
       android:layout_weight="1"
       android:layout_width="0dp" />
     <ImageButton
@@ -34,7 +34,7 @@ limitations under the License.
       android:layout_weight="10"
       android:layout_width="0dp" />
     <RelativeLayout
-      android:layout_height="fill_parent"
+      android:layout_height="match_parent"
       android:layout_weight="6"
       android:layout_width="0dp" >
       <TextView
@@ -52,7 +52,7 @@ limitations under the License.
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:singleLine="true"
-        style="@style/TextTiny" />
+        style="@style/TextMicro" />
     </RelativeLayout>
     <ImageButton
       android:background="@android:color/transparent"
@@ -63,12 +63,12 @@ limitations under the License.
       android:layout_width="0dp"
       android:src="@drawable/btn_stop_1" />
     <View
-      android:layout_height="fill_parent"
+      android:layout_height="match_parent"
       android:layout_weight="1"
       android:layout_width="0dp" />
   </LinearLayout>
   <View
     android:background="@color/gray"
     android:layout_height="1dp"
-    android:layout_width="fill_parent" />
+    android:layout_width="match_parent" />
 </merge>

MyTracks/res/layout/track_detail.xml

@@ -15,23 +15,23 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
+  android:layout_height="match_parent"
+  android:layout_width="match_parent"
   android:orientation="vertical" >
   <TabHost
     android:id="@android:id/tabhost"
     android:layout_height="0dp"
     android:layout_weight="1"
-    android:layout_width="fill_parent" >
+    android:layout_width="match_parent" >
     <LinearLayout
-      android:layout_height="fill_parent"
-      android:layout_width="fill_parent"
+      android:layout_height="match_parent"
+      android:layout_width="match_parent"
       android:orientation="vertical" >
       <TabWidget
         android:id="@android:id/tabs"
         android:layout_height="wrap_content"
         android:layout_weight="0"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:orientation="horizontal" />
       <FrameLayout
         android:id="@android:id/tabcontent"
@@ -42,7 +42,7 @@ limitations under the License.
         android:id="@+id/realtabcontent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        android:layout_width="fill_parent" />
+        android:layout_width="match_parent" />
     </LinearLayout>
   </TabHost>
   <LinearLayout

MyTracks/res/layout/track_edit.xml

@@ -15,13 +15,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
+  android:layout_height="match_parent"
+  android:layout_width="match_parent"
   android:orientation="vertical" >
   <ScrollView style="@style/ScrollView.WithBottomButtons" >
     <LinearLayout
       android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
+      android:layout_width="match_parent"
       android:orientation="vertical"
       android:padding="8dp" >
       <TextView

MyTracks/res/layout/track_list.xml

@@ -15,19 +15,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
+  android:layout_height="match_parent"
+  android:layout_width="match_parent"
   android:orientation="vertical" >
   <ListView
     android:id="@+id/track_list"
     android:layout_height="0dp"
     android:layout_weight="1.0"
-    android:layout_width="fill_parent" />
+    android:layout_width="match_parent" />
   <TextView
     android:id="@+id/track_list_empty_view"
     android:layout_height="0dp"
     android:layout_weight="1.0"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:text="@string/track_list_empty_message"
     android:visibility="gone"
     style="@style/ListEmptyTextView" >

MyTracks/res/layout/track_widget.xml

@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2011 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.
--->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  android:background="@drawable/track_widget_background"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
-  android:padding="@dimen/widget_margin" >
-  <LinearLayout
-    android:layout_height="fill_parent"
-    android:layout_width="fill_parent"
-    android:orientation="vertical"
-    android:paddingBottom="8dp"
-    android:paddingLeft="16dp"
-    android:paddingRight="16dp"
-    android:paddingTop="8dp" >
-    <LinearLayout
-      android:clickable="true"
-      android:id="@+id/track_widget_statistics"
-      android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
-      android:orientation="vertical" >
-      <LinearLayout style="@style/TrackWidgetStat" >
-        <TextView
-          android:text="@string/stats_total_distance"
-          style="@style/TrackWidgetLabel" />
-        <TextView style="@style/TrackWidgetSpacer" />
-        <TextView
-          android:id="@+id/track_widget_total_distance_value"
-          style="@style/TrackWidgetLabel" />
-      </LinearLayout>
-      <LinearLayout style="@style/TrackWidgetSeparator" />
-      <LinearLayout style="@style/TrackWidgetStat" >
-        <TextView
-          android:text="@string/stats_total_time"
-          style="@style/TrackWidgetLabel" />
-        <TextView style="@style/TrackWidgetSpacer" />
-        <Chronometer
-          android:id="@+id/track_widget_total_time_value"
-          style="@style/TrackWidgetLabel" />
-      </LinearLayout>
-      <LinearLayout style="@style/TrackWidgetSeparator" />
-      <LinearLayout style="@style/TrackWidgetStat" >
-        <TextView
-          android:id="@+id/track_widget_average_speed_label"
-          style="@style/TrackWidgetLabel" />
-        <TextView style="@style/TrackWidgetSpacer" />
-        <TextView
-          android:id="@+id/track_widget_average_speed_value"
-          style="@style/TrackWidgetLabel" />
-      </LinearLayout>
-      <LinearLayout
-        android:id="@+id/track_widget_moving_time_container"
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:orientation="vertical" >
-        <LinearLayout style="@style/TrackWidgetSeparator" />
-        <LinearLayout style="@style/TrackWidgetStat" >
-          <TextView
-            android:text="@string/stats_moving_time"
-            style="@style/TrackWidgetLabel" />
-          <TextView style="@style/TrackWidgetSpacer" />
-          <TextView
-            android:id="@+id/track_widget_moving_time_value"
-            style="@style/TrackWidgetLabel" />
-        </LinearLayout>
-      </LinearLayout>
-    </LinearLayout>
-    <LinearLayout
-      android:clipChildren="false"
-      android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
-      android:orientation="horizontal"
-      android:paddingLeft="4dp"
-      android:paddingRight="4dp"
-      android:paddingTop="4dp" >
-      <ImageButton
-        android:background="@android:color/transparent"
-        android:contentDescription="@string/icon_record_track"
-        android:id="@+id/track_widget_record_button"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:src="@drawable/btn_record" />
-      <TextView
-        android:id="@+id/track_widget_record_status"
-        android:layout_gravity="center_vertical"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:layout_width="0dp"
-        android:singleLine="true"
-        style="@style/TextSmall" />
-      <ImageButton
-        android:background="@android:color/transparent"
-        android:contentDescription="@string/icon_stop_recording"
-        android:id="@+id/track_widget_stop_button"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:src="@drawable/btn_stop_0" />
-    </LinearLayout>
-  </LinearLayout>
-</FrameLayout>

MyTracks/res/layout/track_widget_4x1.xml

@@ -0,0 +1,102 @@
+<?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.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  style="@style/TrackWidgetBoundingBox" >
+  <LinearLayout
+    android:orientation="horizontal"
+    android:paddingBottom="4dp"
+    android:paddingTop="4dp"
+    style="@style/TrackWidgetFrame" >
+    <LinearLayout
+      android:layout_weight="1"
+      style="@style/TrackWidgetVerticalSpacer" />
+    <ImageButton
+      android:contentDescription="@string/icon_record_track"
+      android:id="@+id/track_widget_record_button"
+      style="@style/TrackWidgetButtonRecord" />
+    <LinearLayout
+      android:id="@+id/track_widget_stats_container"
+      android:layout_height="match_parent"
+      android:layout_weight="18"
+      android:layout_width="0dp"
+      android:padding="0dp"
+      style="@style/TrackWidgetStatsContainer" >
+      <LinearLayout style="@style/TrackWidgetStatsSection" >
+        <!-- item1 -->
+        <LinearLayout style="@style/TrackWidgetItemContainer" >
+          <TextView
+            android:id="@+id/track_widget_item1_label"
+            style="@style/TrackWidgetLabel" />
+          <LinearLayout style="@style/TrackWidgetValueContainer" >
+            <TextView
+              android:id="@+id/track_widget_item1_value"
+              style="@style/TrackWidgetValue" />
+            <TextView
+              android:id="@+id/track_widget_item1_unit"
+              style="@style/TrackWidgetUnit" />
+            <Chronometer
+              android:id="@+id/track_widget_item1_chronometer"
+              style="@style/TrackWidgetValue" />
+          </LinearLayout>
+        </LinearLayout>
+      </LinearLayout>
+      <!-- horizontal separator -->
+      <LinearLayout
+        android:baselineAligned="false"
+        style="@style/TrackWidgetHorizontalSeparator" >
+        <LinearLayout
+          android:layout_weight="1"
+          style="@style/TrackWidgetHorizontalSpacer" />
+        <LinearLayout
+          android:layout_weight="38"
+          style="@style/TrackWidgetHorizontalLine" />
+        <LinearLayout
+          android:layout_weight="1"
+          style="@style/TrackWidgetHorizontalSpacer" />
+      </LinearLayout>
+      <LinearLayout style="@style/TrackWidgetStatsSection" >
+        <LinearLayout style="@style/TrackWidgetItemContainer" >
+          <!-- item2 -->
+          <TextView
+            android:id="@+id/track_widget_item2_label"
+            style="@style/TrackWidgetLabel" />
+          <LinearLayout style="@style/TrackWidgetValueContainer" >
+            <TextView
+              android:id="@+id/track_widget_item2_value"
+              style="@style/TrackWidgetValue" />
+            <TextView
+              android:id="@+id/track_widget_item2_unit"
+              style="@style/TrackWidgetUnit" />
+            <Chronometer
+              android:id="@+id/track_widget_item2_chronometer"
+              style="@style/TrackWidgetValue" />
+          </LinearLayout>
+        </LinearLayout>
+      </LinearLayout>
+    </LinearLayout>
+    <ImageButton
+      android:contentDescription="@string/icon_stop_recording"
+      android:id="@+id/track_widget_stop_button"
+      style="@style/TrackWidgetButtonStop" />
+    <LinearLayout
+      android:layout_weight="1"
+      style="@style/TrackWidgetVerticalSpacer" />
+  </LinearLayout>
+  <ImageView
+    android:contentDescription="@string/my_tracks_app_name"
+    style="@style/TrackWidgetLogo" />
+</RelativeLayout>

MyTracks/res/layout/track_widget_4x2.xml

@@ -0,0 +1,164 @@
+<?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.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  style="@style/TrackWidgetBoundingBox" >
+  <LinearLayout
+    android:baselineAligned="false"
+    style="@style/TrackWidgetFrame" >
+    <LinearLayout
+      android:baselineAligned="false"
+      android:id="@+id/track_widget_stats_container"
+      android:layout_weight="1"
+      style="@style/TrackWidgetStatsContainer" >
+      <LinearLayout style="@style/TrackWidgetStatsSection" >
+        <!-- item1 -->
+        <LinearLayout style="@style/TrackWidgetItemContainer4x2" >
+          <TextView
+            android:id="@+id/track_widget_item1_label"
+            style="@style/TrackWidgetLabel" />
+          <LinearLayout style="@style/TrackWidgetValueContainer" >
+            <TextView
+              android:id="@+id/track_widget_item1_value"
+              style="@style/TrackWidgetValue" />
+            <TextView
+              android:id="@+id/track_widget_item1_unit"
+              style="@style/TrackWidgetUnit" />
+            <Chronometer
+              android:id="@+id/track_widget_item1_chronometer"
+              style="@style/TrackWidgetValue" />
+          </LinearLayout>
+        </LinearLayout>
+        <!-- vertical separator -->
+        <LinearLayout
+          android:baselineAligned="false"
+          style="@style/TrackWidgetVerticalSeparator" >
+          <LinearLayout
+            android:layout_weight="2"
+            style="@style/TrackWidgetVerticalSpacer" />
+          <LinearLayout
+            android:layout_weight="1"
+            style="@style/TrackWidgetVerticalLine" />
+        </LinearLayout>
+        <!-- item3 -->
+        <LinearLayout style="@style/TrackWidgetItemContainer4x2" >
+          <TextView
+            android:id="@+id/track_widget_item3_label"
+            style="@style/TrackWidgetLabel" />
+          <LinearLayout style="@style/TrackWidgetValueContainer" >
+            <TextView
+              android:id="@+id/track_widget_item3_value"
+              style="@style/TrackWidgetValue" />
+            <TextView
+              android:id="@+id/track_widget_item3_unit"
+              style="@style/TrackWidgetUnit" />
+            <Chronometer
+              android:id="@+id/track_widget_item3_chronometer"
+              style="@style/TrackWidgetValue" />
+          </LinearLayout>
+        </LinearLayout>
+      </LinearLayout>
+      <!-- horizontal separator -->
+      <LinearLayout
+        android:baselineAligned="false"
+        style="@style/TrackWidgetHorizontalSeparator" >
+        <LinearLayout
+          android:layout_weight="1"
+          style="@style/TrackWidgetHorizontalSpacer" />
+        <LinearLayout
+          android:layout_weight="38"
+          style="@style/TrackWidgetHorizontalLine" />
+        <LinearLayout
+          android:layout_weight="1"
+          style="@style/TrackWidgetHorizontalSpacer" />
+      </LinearLayout>
+      <LinearLayout style="@style/TrackWidgetStatsSection" >
+        <!-- item2 -->
+        <LinearLayout style="@style/TrackWidgetItemContainer4x2" >
+          <TextView
+            android:id="@+id/track_widget_item2_label"
+            style="@style/TrackWidgetLabel" />
+          <LinearLayout style="@style/TrackWidgetValueContainer" >
+            <TextView
+              android:id="@+id/track_widget_item2_value"
+              style="@style/TrackWidgetValue" />
+            <TextView
+              android:id="@+id/track_widget_item2_unit"
+              style="@style/TrackWidgetUnit" />
+            <Chronometer
+              android:id="@+id/track_widget_item2_chronometer"
+              style="@style/TrackWidgetValue" />
+          </LinearLayout>
+        </LinearLayout>
+        <!-- vertical separator -->
+        <LinearLayout
+          android:baselineAligned="false"
+          style="@style/TrackWidgetVerticalSeparator" >
+          <LinearLayout
+            android:layout_weight="1"
+            style="@style/TrackWidgetVerticalLine" />
+          <LinearLayout
+            android:layout_weight="2"
+            style="@style/TrackWidgetVerticalSpacer" />
+        </LinearLayout>
+        <!-- item4 -->
+        <LinearLayout style="@style/TrackWidgetItemContainer4x2" >
+          <TextView
+            android:id="@+id/track_widget_item4_label"
+            style="@style/TrackWidgetLabel" />
+          <LinearLayout style="@style/TrackWidgetValueContainer" >
+            <TextView
+              android:id="@+id/track_widget_item4_value"
+              style="@style/TrackWidgetValue" />
+            <TextView
+              android:id="@+id/track_widget_item4_unit"
+              style="@style/TrackWidgetUnit" />
+            <Chronometer
+              android:id="@+id/track_widget_item4_chronometer"
+              style="@style/TrackWidgetValue" />
+          </LinearLayout>
+        </LinearLayout>
+      </LinearLayout>
+    </LinearLayout>
+    <LinearLayout style="@style/TrackWidgetButtonContainer" >
+      <LinearLayout
+        android:layout_weight="1"
+        style="@style/TrackWidgetVerticalSpacer" />
+      <ImageButton
+        android:contentDescription="@string/icon_record_track"
+        android:id="@+id/track_widget_record_button"
+        style="@style/TrackWidgetButtonRecord" />
+      <TextView
+        android:id="@+id/track_widget_record_status"
+        android:layout_gravity="center_vertical"
+        android:layout_height="wrap_content"
+        android:layout_weight="2"
+        android:layout_width="0dp"
+        android:singleLine="true"
+        style="@style/TextSmall" />
+      <ImageButton
+        android:contentDescription="@string/icon_stop_recording"
+        android:id="@+id/track_widget_stop_button"
+        style="@style/TrackWidgetButtonStop" />
+      <LinearLayout
+        android:layout_weight="1"
+        style="@style/TrackWidgetVerticalSpacer" />
+    </LinearLayout>
+  </LinearLayout>
+  <ImageView
+    android:contentDescription="@string/my_tracks_app_name"
+    style="@style/TrackWidgetLogo" />
+</RelativeLayout>

MyTracks/res/layout/track_widget_4x3.xml

@@ -0,0 +1,164 @@
+<?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.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  style="@style/TrackWidgetBoundingBox" >
+  <LinearLayout
+    android:baselineAligned="false"
+    style="@style/TrackWidgetFrame" >
+    <LinearLayout
+      android:baselineAligned="false"
+      android:id="@+id/track_widget_stats_container"
+      android:layout_weight="2"
+      style="@style/TrackWidgetStatsContainer" >
+      <LinearLayout style="@style/TrackWidgetStatsSection" >
+        <!-- item1 -->
+        <LinearLayout style="@style/TrackWidgetItemContainer4x3" >
+          <TextView
+            android:id="@+id/track_widget_item1_label"
+            style="@style/TrackWidgetLabel" />
+          <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
+            <TextView
+              android:id="@+id/track_widget_item1_value"
+              style="@style/TrackWidgetValue4x3" />
+            <TextView
+              android:id="@+id/track_widget_item1_unit"
+              style="@style/TrackWidgetUnit4x3" />
+            <Chronometer
+              android:id="@+id/track_widget_item1_chronometer"
+              style="@style/TrackWidgetValue4x3" />
+          </LinearLayout>
+        </LinearLayout>
+        <!-- vertical separator -->
+        <LinearLayout
+          android:baselineAligned="false"
+          style="@style/TrackWidgetVerticalSeparator" >
+          <LinearLayout
+            android:layout_weight="2"
+            style="@style/TrackWidgetVerticalSpacer" />
+          <LinearLayout
+            android:layout_weight="1"
+            style="@style/TrackWidgetVerticalLine" />
+        </LinearLayout>
+        <!-- item3 -->
+        <LinearLayout style="@style/TrackWidgetItemContainer4x3" >
+          <TextView
+            android:id="@+id/track_widget_item3_label"
+            style="@style/TrackWidgetLabel" />
+          <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
+            <TextView
+              android:id="@+id/track_widget_item3_value"
+              style="@style/TrackWidgetValue4x3" />
+            <TextView
+              android:id="@+id/track_widget_item3_unit"
+              style="@style/TrackWidgetUnit4x3" />
+            <Chronometer
+              android:id="@+id/track_widget_item3_chronometer"
+              style="@style/TrackWidgetValue4x3" />
+          </LinearLayout>
+        </LinearLayout>
+      </LinearLayout>
+      <!-- horizontal separator -->
+      <LinearLayout
+        android:baselineAligned="false"
+        style="@style/TrackWidgetHorizontalSeparator" >
+        <LinearLayout
+          android:layout_weight="1"
+          style="@style/TrackWidgetHorizontalSpacer" />
+        <LinearLayout
+          android:layout_weight="38"
+          style="@style/TrackWidgetHorizontalLine" />
+        <LinearLayout
+          android:layout_weight="1"
+          style="@style/TrackWidgetHorizontalSpacer" />
+      </LinearLayout>
+      <LinearLayout style="@style/TrackWidgetStatsSection" >
+        <!-- item2 -->
+        <LinearLayout style="@style/TrackWidgetItemContainer4x3" >
+          <TextView
+            android:id="@+id/track_widget_item2_label"
+            style="@style/TrackWidgetLabel" />
+          <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
+            <TextView
+              android:id="@+id/track_widget_item2_value"
+              style="@style/TrackWidgetValue4x3" />
+            <TextView
+              android:id="@+id/track_widget_item2_unit"
+              style="@style/TrackWidgetUnit4x3" />
+            <Chronometer
+              android:id="@+id/track_widget_item2_chronometer"
+              style="@style/TrackWidgetValue4x3" />
+          </LinearLayout>
+        </LinearLayout>
+        <!-- vertical separator -->
+        <LinearLayout
+          android:baselineAligned="false"
+          style="@style/TrackWidgetVerticalSeparator" >
+          <LinearLayout
+            android:layout_weight="1"
+            style="@style/TrackWidgetVerticalLine" />
+          <LinearLayout
+            android:layout_weight="2"
+            style="@style/TrackWidgetVerticalSpacer" />
+        </LinearLayout>
+        <!-- item4 -->
+        <LinearLayout style="@style/TrackWidgetItemContainer4x3" >
+          <TextView
+            android:id="@+id/track_widget_item4_label"
+            style="@style/TrackWidgetLabel" />
+          <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
+            <TextView
+              android:id="@+id/track_widget_item4_value"
+              style="@style/TrackWidgetValue4x3" />
+            <TextView
+              android:id="@+id/track_widget_item4_unit"
+              style="@style/TrackWidgetUnit4x3" />
+            <Chronometer
+              android:id="@+id/track_widget_item4_chronometer"
+              style="@style/TrackWidgetValue4x3" />
+          </LinearLayout>
+        </LinearLayout>
+      </LinearLayout>
+    </LinearLayout>
+    <LinearLayout style="@style/TrackWidgetButtonContainer" >
+      <LinearLayout
+        android:layout_weight="1"
+        style="@style/TrackWidgetVerticalSpacer" />
+      <ImageButton
+        android:contentDescription="@string/icon_record_track"
+        android:id="@+id/track_widget_record_button"
+        style="@style/TrackWidgetButtonRecord" />
+      <TextView
+        android:id="@+id/track_widget_record_status"
+        android:layout_gravity="center_vertical"
+        android:layout_height="wrap_content"
+        android:layout_weight="2"
+        android:layout_width="0dp"
+        android:singleLine="true"
+        style="@style/TextSmall" />
+      <ImageButton
+        android:contentDescription="@string/icon_stop_recording"
+        android:id="@+id/track_widget_stop_button"
+        style="@style/TrackWidgetButtonStop" />
+      <LinearLayout
+        android:layout_weight="1"
+        style="@style/TrackWidgetVerticalSpacer" />
+    </LinearLayout>
+  </LinearLayout>
+  <ImageView
+    android:contentDescription="@string/my_tracks_app_name"
+    style="@style/TrackWidgetLogo" />
+</RelativeLayout>

MyTracks/res/layout/track_widget_4x4.xml

@@ -0,0 +1,168 @@
+<?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.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  style="@style/TrackWidgetBoundingBox" >
+  <LinearLayout
+    android:baselineAligned="false"
+    style="@style/TrackWidgetFrame" >
+    <LinearLayout
+      android:baselineAligned="false"
+      android:id="@+id/track_widget_stats_container"
+      android:layout_weight="3"
+      style="@style/TrackWidgetStatsContainer" >
+      <LinearLayout style="@style/TrackWidgetStatsSection" >
+        <!-- item1 -->
+        <LinearLayout style="@style/TrackWidgetItemContainer4x4" >
+          <TextView
+            android:id="@+id/track_widget_item1_label"
+            style="@style/TrackWidgetLabel4x4" />
+          <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
+            <TextView
+              android:id="@+id/track_widget_item1_value"
+              style="@style/TrackWidgetValue4x4" />
+            <TextView
+              android:id="@+id/track_widget_item1_unit"
+              style="@style/TrackWidgetUnit4x4" />
+            <Chronometer
+              android:id="@+id/track_widget_item1_chronometer"
+              style="@style/TrackWidgetValue4x4" />
+          </LinearLayout>
+        </LinearLayout>
+      </LinearLayout>
+      <!-- horizontal separator -->
+      <LinearLayout
+        android:baselineAligned="false"
+        style="@style/TrackWidgetHorizontalSeparator" >
+        <LinearLayout
+          android:layout_weight="1"
+          style="@style/TrackWidgetHorizontalSpacer" />
+        <LinearLayout
+          android:layout_weight="4"
+          style="@style/TrackWidgetHorizontalLine" />
+        <LinearLayout
+          android:layout_weight="1"
+          style="@style/TrackWidgetHorizontalSpacer" />
+      </LinearLayout>
+      <LinearLayout style="@style/TrackWidgetStatsSection" >
+        <!-- item3 -->
+        <LinearLayout style="@style/TrackWidgetItemContainer4x4" >
+          <TextView
+            android:id="@+id/track_widget_item3_label"
+            style="@style/TrackWidgetLabel4x4" />
+          <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
+            <TextView
+              android:id="@+id/track_widget_item3_value"
+              style="@style/TrackWidgetValue4x4" />
+            <TextView
+              android:id="@+id/track_widget_item3_unit"
+              style="@style/TrackWidgetUnit4x4" />
+            <Chronometer
+              android:id="@+id/track_widget_item3_chronometer"
+              style="@style/TrackWidgetValue4x4" />
+          </LinearLayout>
+        </LinearLayout>
+      </LinearLayout>
+      <LinearLayout
+        android:baselineAligned="false"
+        style="@style/TrackWidgetHorizontalSeparator" >
+        <LinearLayout
+          android:layout_weight="1"
+          style="@style/TrackWidgetHorizontalSpacer" />
+        <LinearLayout
+          android:layout_weight="38"
+          style="@style/TrackWidgetHorizontalLine" />
+        <LinearLayout
+          android:layout_weight="1"
+          style="@style/TrackWidgetHorizontalSpacer" />
+      </LinearLayout>
+      <LinearLayout style="@style/TrackWidgetStatsSection" >
+        <!-- item2 -->
+        <LinearLayout style="@style/TrackWidgetItemContainer4x3" >
+          <TextView
+            android:id="@+id/track_widget_item2_label"
+            style="@style/TrackWidgetLabel4x4" />
+          <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
+            <TextView
+              android:id="@+id/track_widget_item2_value"
+              style="@style/TrackWidgetValue4x3" />
+            <TextView
+              android:id="@+id/track_widget_item2_unit"
+              style="@style/TrackWidgetUnit4x3" />
+            <Chronometer
+              android:id="@+id/track_widget_item2_chronometer"
+              style="@style/TrackWidgetValue4x3" />
+          </LinearLayout>
+        </LinearLayout>
+        <!-- vertical separator -->
+        <LinearLayout
+          android:baselineAligned="false"
+          style="@style/TrackWidgetVerticalSeparator" >
+          <LinearLayout
+            android:layout_weight="1"
+            style="@style/TrackWidgetVerticalLine" />
+          <LinearLayout
+            android:layout_weight="2"
+            style="@style/TrackWidgetVerticalSpacer" />
+        </LinearLayout>
+        <!-- item4 -->
+        <LinearLayout style="@style/TrackWidgetItemContainer4x3" >
+          <TextView
+            android:id="@+id/track_widget_item4_label"
+            style="@style/TrackWidgetLabel4x4" />
+          <LinearLayout style="@style/TrackWidgetValueContainer4x3" >
+            <TextView
+              android:id="@+id/track_widget_item4_value"
+              style="@style/TrackWidgetValue4x3" />
+            <TextView
+              android:id="@+id/track_widget_item4_unit"
+              style="@style/TrackWidgetUnit4x3" />
+            <Chronometer
+              android:id="@+id/track_widget_item4_chronometer"
+              style="@style/TrackWidgetValue4x3" />
+          </LinearLayout>
+        </LinearLayout>
+      </LinearLayout>
+    </LinearLayout>
+    <LinearLayout style="@style/TrackWidgetButtonContainer" >
+      <LinearLayout
+        android:layout_weight="1"
+        style="@style/TrackWidgetVerticalSpacer" />
+      <ImageButton
+        android:contentDescription="@string/icon_record_track"
+        android:id="@+id/track_widget_record_button"
+        style="@style/TrackWidgetButtonRecord" />
+      <TextView
+        android:id="@+id/track_widget_record_status"
+        android:layout_gravity="center_vertical"
+        android:layout_height="wrap_content"
+        android:layout_weight="2"
+        android:layout_width="0dp"
+        android:singleLine="true"
+        style="@style/TextSmall" />
+      <ImageButton
+        android:contentDescription="@string/icon_stop_recording"
+        android:id="@+id/track_widget_stop_button"
+        style="@style/TrackWidgetButtonStop" />
+      <LinearLayout
+        android:layout_weight="1"
+        style="@style/TrackWidgetVerticalSpacer" />
+    </LinearLayout>
+  </LinearLayout>
+  <ImageView
+    android:contentDescription="@string/my_tracks_app_name"
+    style="@style/TrackWidgetLogo4x4" />
+</RelativeLayout>

MyTracks/res/layout/track_widget_config.xml

@@ -0,0 +1,44 @@
+<?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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_height="match_parent"
+  android:layout_width="match_parent"
+  android:orientation="vertical" >
+  <ScrollView style="@style/ScrollView.WithBottomButtons" >
+    <LinearLayout
+      android:layout_height="wrap_content"
+      android:layout_width="match_parent"
+      android:orientation="vertical"
+      android:padding="8dp" >
+      <Spinner
+        android:id="@+id/track_widget_config_item1"
+        style="@style/TrackWidgetConfigSpinner" />
+      <Spinner
+        android:id="@+id/track_widget_config_item2"
+        style="@style/TrackWidgetConfigSpinner" />
+      <Spinner
+        android:id="@+id/track_widget_config_item3"
+        style="@style/TrackWidgetConfigSpinner" />
+      <Spinner
+        android:id="@+id/track_widget_config_item4"
+        style="@style/TrackWidgetConfigSpinner" />
+    </LinearLayout>
+  </ScrollView>
+  <LinearLayout style="@style/BottomButtonBar" >
+    <include layout="@layout/bottom_buttons" />
+  </LinearLayout>
+</LinearLayout>

MyTracks/res/layout/upload_result.xml

@@ -18,7 +18,7 @@ limitations under the License.
   style="@style/ScrollView" >
   <LinearLayout
     android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:orientation="vertical"
     android:padding="8dp" >
     <!-- Google Maps result -->

MyTracks/res/menu/map.xml

@@ -16,8 +16,25 @@ 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>
+      <group android:checkableBehavior="single" >
+        <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_satellite_with_streets"
+          android:title="@string/menu_satellite_with_streets"/>
+        <item
+          android:id="@+id/menu_terrain"
+          android:title="@string/menu_terrain"/>
+      </group>
+    </menu>
+  </item>
 </menu>