Merge heads

MyTracks/AndroidManifest.xml

@@ -22,19 +22,16 @@ limitations under the License.
 
   <!-- Permission to initialize services -->
   <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-
   <!-- Permissions to record locations -->
   <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
   <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
   <uses-permission android:name="android.permission.WAKE_LOCK" />
-
   <!-- Permissions to access sensors -->
   <uses-permission android:name="com.dsi.ant.permission.ANT" />
   <uses-permission android:name="com.dsi.ant.permission.ANT_ADMIN" />
   <uses-permission android:name="android.permission.BLUETOOTH" />
   <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-
   <!-- Permissions to upload tracks -->
   <uses-permission android:name="android.permission.GET_ACCOUNTS" />
   <uses-permission android:name="android.permission.INTERNET" />
@@ -46,18 +43,14 @@ limitations under the License.
   <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.wise" />
   <uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.writely" />
   <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" />
-
   <!-- Permission to write to SD card -->
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-
   <!-- Permissions to access My Tracks data -->
   <uses-permission android:name="com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS" />
   <uses-permission android:name="com.google.android.apps.mytracks.READ_TRACK_DATA" />
   <uses-permission android:name="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
-
   <!-- Permission to receive My Tracks internal broadcasts -->
   <permission
     android:description="@string/permission_notification_label"
@@ -90,7 +83,6 @@ limitations under the License.
   <uses-sdk
     android:minSdkVersion="7"
     android:targetSdkVersion="15" />
-
   <!-- Required features -->
   <uses-feature
     android:name="android.hardware.location"
@@ -98,7 +90,6 @@ limitations under the License.
   <uses-feature
     android:name="android.hardware.location.gps"
     android:required="true" />
-
   <!-- Optional features -->
   <uses-feature
     android:name="android.hardware.bluetooth"
@@ -134,7 +125,7 @@ limitations under the License.
 
   <application
     android:backupAgent="com.google.android.apps.mytracks.io.backup.MyTracksBackupAgent"
-    android:icon="@drawable/arrow_icon"
+    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" >
@@ -143,21 +134,16 @@ limitations under the License.
     <meta-data
       android:name="com.google.android.backup.api_key"
       android:value="AEdPqrEAAAAIi-_QiwoRSc9_bAC9cmuNXTQyU8ajJmGtKdhskQ" />
-
+    <!-- Activities -->
     <activity
       android:label="@string/menu_aggregated_statistics"
       android:name="com.google.android.apps.mytracks.AggregatedStatsActivity" />
-    <activity android:name="com.google.android.apps.mytracks.ExportActivity"/>
     <activity
       android:label="@string/menu_help"
       android:name="com.google.android.apps.mytracks.HelpActivity" />
     <activity
-      android:label="@string/my_tracks_importer"
+      android:name="com.google.android.apps.mytracks.ImportActivity" >
-      android:name="com.google.android.apps.mytracks.ImportActivity"
-      android:noHistory="true"
-      android:theme="@android:style/Theme.Translucent.NoTitleBar" >
       <intent-filter>
-
         <action android:name="android.intent.action.ATTACH_DATA" />
         <action android:name="android.intent.action.VIEW" />
 
@@ -172,17 +158,17 @@ limitations under the License.
       </intent-filter>
     </activity>
     <activity
-      android:name="com.google.android.apps.mytracks.MarkerEditActivity"
+      android:name="com.google.android.apps.mytracks.MarkerEditActivity" />
-      android:windowSoftInputMode="stateHidden" />
     <activity android:name="com.google.android.apps.mytracks.MarkerDetailActivity" />
     <activity android:name="com.google.android.apps.mytracks.MarkerListActivity" >
       <meta-data
         android:name="android.app.default_searchable"
-        android:value="com.google.android.apps.mytracks.SearchActivity" />
+        android:value="com.google.android.apps.mytracks.SearchListActivity" />
     </activity>
+    <activity android:name="com.google.android.apps.mytracks.SaveAllActivity" />
     <activity
       android:launchMode="singleTop"
-      android:name="com.google.android.apps.mytracks.SearchActivity" >
+      android:name="com.google.android.apps.mytracks.SearchListActivity" >
       <intent-filter>
         <action android:name="android.intent.action.SEARCH" />
       </intent-filter>
@@ -196,37 +182,26 @@ limitations under the License.
       android:name="com.google.android.apps.mytracks.SensorStateActivity" />
     <activity
       android:label="@string/settings_title"
-      android:name="com.google.android.apps.mytracks.SettingsActivity" >
+      android:name="com.google.android.apps.mytracks.SettingsActivity" />
-      <intent-filter>
-        <category android:name="android.intent.category.PREFERENCE" />
-      </intent-filter>
-    </activity>
     <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.SearchActivity" />
+        android:value="com.google.android.apps.mytracks.SearchListActivity" />
     </activity>
-    <activity android:name="com.google.android.apps.mytracks.io.backup.BackupActivity"/>
+    <activity android:name="com.google.android.apps.mytracks.io.backup.BackupActivity" />
-    <activity android:name="com.google.android.apps.mytracks.io.backup.RestoreActivity"/>
+    <activity android:name="com.google.android.apps.mytracks.io.backup.RestoreActivity" />
-    <activity android:name="com.google.android.apps.mytracks.io.backup.RestoreChooserActivity"/>
+    <activity android:name="com.google.android.apps.mytracks.io.backup.RestoreChooserActivity" />
     <activity android:name="com.google.android.apps.mytracks.io.docs.SendDocsActivity" />
-    <activity
+    <activity android:name="com.google.android.apps.mytracks.io.file.SaveActivity" />
-      android:name="com.google.android.apps.mytracks.io.file.SaveActivity"
-      android:noHistory="true"
-      android:theme="@android:style/Theme.Translucent.NoTitleBar" >
-      <intent-filter>
-        <action android:name="android.intent.action.SAVE" />
-
-        <data android:mimeType="vnd.android.cursor.item/vnd.google.track" />
-      </intent-filter>
-    </activity>
     <activity android:name="com.google.android.apps.mytracks.io.fusiontables.SendFusionTablesActivity" />
     <activity
       android:label="@string/maps_list_title"
@@ -235,7 +210,7 @@ limitations under the License.
     <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.AccountChooserActivity" />
     <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadResultActivity" />
     <activity android:name="com.google.android.apps.mytracks.io.sendtogoogle.UploadServiceChooserActivity" />
-                
+    <!-- Services -->
     <service
       android:exported="false"
       android:name="com.google.android.apps.mytracks.services.ControlRecordingService" />
@@ -247,7 +222,7 @@ limitations under the License.
       android:label="@string/my_tracks_recording_service"
       android:name="com.google.android.apps.mytracks.services.TrackRecordingService"
       android:permission="com.google.android.apps.mytracks.WRITE_TRACK_DATA" />
-
+    <!-- Receivers -->
     <receiver android:name="com.google.android.apps.mytracks.BootReceiver" >
       <intent-filter>
         <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -264,7 +239,7 @@ limitations under the License.
         android:name="android.appwidget.provider"
         android:resource="@xml/track_widget_info" />
     </receiver>
-
+    <!-- Providers -->
     <!-- My Tracks data provider -->
     <provider
       android:authorities="com.google.android.maps.mytracks"

MyTracks/res/drawable/my_location.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright 2010 Google Inc.
+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.
@@ -14,8 +14,8 @@ 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"
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  android:layout_height="fill_parent"
+  <item android:state_pressed="true"
-  android:layout_width="fill_parent" >
+        android:drawable="@drawable/my_location_pressed" />
-  <include layout="@layout/help_content"/>
+  <item android:drawable="@drawable/my_location_normal" />
-</ScrollView>
+</selector>

MyTracks/res/layout/about.xml

@@ -15,64 +15,35 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
+  style="@style/ScrollView" >
-  android:layout_width="fill_parent" >
-
   <LinearLayout
     android:layout_height="wrap_content"
     android:layout_width="fill_parent"
     android:orientation="vertical"
     android:padding="8dp" >
-
     <TextView
-      android:drawableLeft="@drawable/arrow_icon"
+      android:drawableLeft="@drawable/my_tracks_icon"
-      android:drawablePadding="8dp"
+      android:text="@string/about_copyright_notice"
-      android:gravity="center"
+      style="@style/TextMedium.WithIcon" />
-      android:layout_height="wrap_content"
-      android:layout_width="wrap_content"
-      style="@android:style/TextAppearance.DeviceDefault.Medium"
-      android:text="@string/about_copyright_notice" />
-
     <TextView
-      android:layout_height="wrap_content"
+      android:text="@string/about_version"
-      android:layout_width="wrap_content"
+      style="@style/TextLarge" />
-      style="@android:style/TextAppearance.DeviceDefault.Large"
-      android:text="@string/about_version" />
-
     <TextView
       android:id="@+id/about_version"
-      android:layout_height="wrap_content"
+      style="@style/AboutValue" />
-      android:layout_width="wrap_content"
-      android:paddingLeft="48dp"
-      style="@android:style/TextAppearance.DeviceDefault.Medium" />
-
     <TextView
-      android:layout_height="wrap_content"
+      android:text="@string/about_support"
-      android:layout_width="wrap_content"
+      style="@style/TextLarge" />
-      style="@android:style/TextAppearance.DeviceDefault.Large"
-      android:text="@string/about_support" />
-
     <TextView
       android:autoLink="web"
-      android:layout_height="wrap_content"
+      android:text="@string/my_tracks_support_url"
-      android:layout_width="wrap_content"
+      style="@style/AboutValue" />
-      android:paddingLeft="48dp"
-      style="@android:style/TextAppearance.DeviceDefault.Medium"
-      android:text="@string/my_tracks_support_url" />
-
     <TextView
-      android:layout_height="wrap_content"
+      android:text="@string/about_privacy"
-      android:layout_width="wrap_content"
+      style="@style/TextLarge" />
-      style="@android:style/TextAppearance.DeviceDefault.Large"
-      android:text="@string/about_privacy" />
-
     <TextView
       android:autoLink="web"
-      android:layout_height="wrap_content"
+      android:text="@string/my_tracks_privacy_url"
-      android:layout_width="wrap_content"
+      style="@style/AboutValue" />
-      android:paddingLeft="48dp"
-      style="@android:style/TextAppearance.DeviceDefault.Medium"
-      android:text="@string/my_tracks_privacy_url" />
   </LinearLayout>
-
 </ScrollView>

MyTracks/res/layout/aggregated_stats.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright 2010 Google Inc.
+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.
@@ -14,6 +14,14 @@ 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.
 -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-  <gradient android:startColor="#ff999999" android:endColor="#ff777777" android:angle="270"/>
+  style="@style/ScrollView">
-</shape>
+  <TableLayout
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:padding="8dp"
+    android:shrinkColumns="0,2"
+    android:stretchColumns="0,2" >
+    <include layout="@layout/stats_core" />
+  </TableLayout>
+</ScrollView>

MyTracks/res/layout/chart.xml

@@ -15,27 +15,21 @@ 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:gravity="center_vertical"
+  android:layout_height="fill_parent"
-  android:layout_height="wrap_content"
   android:layout_width="fill_parent"
-  android:minHeight="?android:attr/listPreferredItemHeight"
+  android:orientation="vertical" >
-  android:orientation="vertical"
-  android:padding="8dp" >
   <LinearLayout
+    android:id="@+id/chart_view_layout"
+    android:layout_height="0dp"
+    android:layout_weight="1"
+    android:layout_width="fill_parent"
+    android:orientation="vertical" >
+  </LinearLayout>
+  <ZoomControls
+    android:background="@android:color/white"
+    android:gravity="right"
+    android:id="@+id/chart_zoom_controls"
     android:layout_height="wrap_content"
     android:layout_width="fill_parent"
-    android:orientation="horizontal" >
+    android:paddingRight="8dp" />
-    <TextView
-      android:id="@+id/marker_list_item_name"
-      style="@style/ListItemName" />
-    <TextView
-      android:id="@+id/marker_list_item_category"
-      style="@style/ListItemCategory" />
-  </LinearLayout>
-  <TextView
-    android:id="@+id/marker_list_item_time"
-    style="@style/ListItemStat" />
-  <TextView
-    android:id="@+id/marker_list_item_description"
-    style="@style/ListItemDescription" />
 </LinearLayout>

MyTracks/res/layout/chart_settings.xml

@@ -15,87 +15,52 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
+  style="@style/ScrollView" >
-  android:layout_width="fill_parent" >
-
   <LinearLayout
     android:layout_height="wrap_content"
     android:layout_width="fill_parent"
     android:orientation="vertical"
     android:padding="8dp" >
-
     <TextView
       android:drawableLeft="@drawable/x_axis"
-      android:drawablePadding="8dp"
+      android:text="@string/chart_settings_x_axis"
-      android:gravity="bottom"
+      style="@style/TextLarge.WithIcon" />
-      android:layout_height="wrap_content"
-      android:layout_width="wrap_content"
-      style="@android:style/TextAppearance.DeviceDefault.Large"
-      android:text="@string/chart_settings_x_axis" />
-
     <RadioGroup
       android:id="@+id/chart_settings_x"
       android:layout_height="wrap_content"
       android:layout_width="wrap_content" >
-
       <RadioButton
         android:id="@+id/chart_settings_by_distance"
-        android:layout_height="wrap_content"
+        android:text="@string/chart_settings_by_distance"
-        android:layout_width="wrap_content"
+        style="@style/TextMedium" />
-        style="@android:style/TextAppearance.DeviceDefault.Medium"
-        android:text="@string/chart_settings_by_distance" />
-
       <RadioButton
         android:id="@+id/chart_settings_by_time"
-        android:layout_height="wrap_content"
+        android:text="@string/chart_settings_by_time"
-        android:layout_width="wrap_content"
+        style="@style/TextMedium" />
-        style="@android:style/TextAppearance.DeviceDefault.Medium"
-        android:text="@string/chart_settings_by_time" />
     </RadioGroup>
-
     <TextView
       android:drawableLeft="@drawable/y_axis"
-      android:drawablePadding="8dp"
+      android:text="@string/chart_settings_y_axis"
-      android:gravity="bottom"
+      style="@style/TextLarge.WithIcon" />
-      android:layout_height="wrap_content"
-      android:layout_width="wrap_content"
-      style="@android:style/TextAppearance.DeviceDefault.Large"
-      android:text="@string/chart_settings_y_axis" />
-
     <CheckBox
       android:id="@+id/chart_settings_elevation"
-      android:layout_height="wrap_content"
+      android:text="@string/stats_elevation"
-      android:layout_width="wrap_content"
+      style="@style/TextMedium" />
-      style="@android:style/TextAppearance.DeviceDefault.Medium"
-      android:text="@string/stat_elevation" />
-
     <CheckBox
       android:id="@+id/chart_settings_speed"
-      android:layout_height="wrap_content"
+      android:text="@string/stats_speed"
-      android:layout_width="wrap_content"
+      style="@style/TextMedium" />
-      style="@android:style/TextAppearance.DeviceDefault.Medium"
-      android:text="@string/stat_speed" />
-
     <CheckBox
       android:id="@+id/chart_settings_power"
-      android:layout_height="wrap_content"
+      android:text="@string/sensor_state_power"
-      android:layout_width="wrap_content"
+      style="@style/TextMedium" />
-      style="@android:style/TextAppearance.DeviceDefault.Medium"
-      android:text="@string/sensor_state_power" />
-
     <CheckBox
       android:id="@+id/chart_settings_cadence"
-      android:layout_height="wrap_content"
+      android:text="@string/sensor_state_cadence"
-      android:layout_width="wrap_content"
+      style="@style/TextMedium" />
-      style="@android:style/TextAppearance.DeviceDefault.Medium"
-      android:text="@string/sensor_state_cadence" />
-
     <CheckBox
       android:id="@+id/chart_settings_heart_rate"
-      android:layout_height="wrap_content"
+      android:text="@string/sensor_state_heart_rate"
-      android:layout_width="wrap_content"
+      style="@style/TextMedium" />
-      style="@android:style/TextAppearance.DeviceDefault.Medium"
-      android:text="@string/sensor_state_heart_rate" />
   </LinearLayout>
-
 </ScrollView>

MyTracks/res/layout/choose_map.xml

@@ -14,32 +14,15 @@ 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"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
+  android:layout_width="fill_parent" >
-  android:orientation="vertical">
-  <TextView
-    android:background="@drawable/list_bar"
-    android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
-    android:padding="5dp"
-    android:text="@string/maps_list_pick_map"
-    android:textColor="@color/white"
-    android:textSize="16sp"/>
   <ListView
     android:id="@+id/choose_map_list_view"
     android:layout_height="fill_parent"
-    android:layout_weight="1"
+    android:layout_width="fill_parent" />
-    android:layout_width="fill_parent"
-    android:padding="5dp"/>
   <TextView
     android:id="@+id/choose_map_empty_view"
-    android:gravity="center"
+    style="@style/ListEmptyTextView" >
-    android:layout_height="fill_parent"
+  </TextView>
-    android:layout_weight="1"
+</merge>
-    android:layout_width="fill_parent"
-    android:padding="5dp"
-    android:textColor="@color/red"
-    android:textSize="16sp"
-    android:textStyle="bold"/>
-</LinearLayout>

MyTracks/res/layout/choose_map_item.xml

@@ -15,33 +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:gravity="center_vertical"
   android:layout_height="wrap_content"
   android:layout_width="fill_parent"
+  android:minHeight="?android:attr/listPreferredItemHeight"
   android:orientation="vertical"
-  android:paddingBottom="2dp"
+  android:padding="8dp" >
-  android:paddingTop="2dp">
   <TextView
-    android:id="@+id/choose_map_list_item_title"
+    android:id="@+id/choose_map_item_title"
-    android:layout_height="wrap_content"
+    android:singleLine="true"
-    android:layout_marginLeft="6dp"
+    style="@style/TextLarge" />
-    android:layout_marginTop="6dp"
-    android:layout_width="fill_parent"
-    android:textColor="@color/white"
-    android:textSize="18sp"
-    android:textStyle="bold"
-    android:singleLine="true"/>
   <TextView
-    android:id="@+id/choose_map_list_item_description"
+    android:id="@+id/choose_map_item_description"
-    android:layout_height="wrap_content"
+    android:singleLine="false"
-    android:layout_marginLeft="6dp"
+    android:textColor="@android:color/secondary_text_dark"
-    android:layout_width="fill_parent"
+    style="@style/TextSmall" />
-    android:textSize="14sp"
-    android:singleLine="true"/>
   <TextView
-    android:id="@+id/choose_map_list_item_search_status"
+    android:id="@+id/choose_map_item_search_status"
-    android:layout_height="wrap_content"
+    android:singleLine="true"
-    android:layout_marginLeft="6dp"
+    style="@style/TextSmall" />
-    android:layout_width="fill_parent"
+</LinearLayout>
-    android:textSize="14sp"
-    android:singleLine="true"/>
-</LinearLayout>

MyTracks/res/layout/help.xml

@@ -18,11 +18,103 @@ limitations under the License.
   android:layout_height="fill_parent"
   android:layout_width="fill_parent"
   android:orientation="vertical" >
-  <ScrollView
+  <ScrollView style="@style/ScrollView.WithBottomButtons" >
-    android:layout_height="0dp"
+    <LinearLayout
-    android:layout_weight="1"
+      android:layout_height="wrap_content"
-    android:layout_width="fill_parent" >
+      android:layout_width="fill_parent"
-    <include layout="@layout/welcome" />
+      android:orientation="vertical"
+      android:padding="8dp" >
+      <ImageView
+        android:contentDescription="@string/my_tracks_app_name"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:scaleType="fitStart"
+        android:src="@drawable/my_tracks_icon" />
+      <TextView
+        android:text="@string/help_my_tracks_question"
+        style="@style/HelpQuestion" />
+      <TextView
+        android:text="@string/help_my_tracks_answer"
+        style="@style/HelpAnswer" />
+      <TextView
+        android:text="@string/help_location_precision_question"
+        style="@style/HelpQuestion" />
+      <TextView
+        android:text="@string/help_location_precision_answer"
+        style="@style/HelpAnswer" />
+      <TextView
+        android:text="@string/help_gps_fix_question"
+        style="@style/HelpQuestion" />
+      <TextView
+        android:text="@string/help_gps_fix_answer"
+        style="@style/HelpAnswer" />
+      <TextView
+        android:text="@string/help_data_connection_question"
+        style="@style/HelpQuestion" />
+      <TextView
+        android:text="@string/help_data_connection_answer"
+        style="@style/HelpAnswer" />
+      <TextView
+        android:text="@string/help_elevation_precision_question"
+        style="@style/HelpQuestion" />
+      <TextView
+        android:text="@string/help_elevation_precision_answer"
+        style="@style/HelpAnswer" />
+      <TextView
+        android:text="@string/help_battery_life_question"
+        style="@style/HelpQuestion" />
+      <TextView
+        android:text="@string/help_battery_life_answer"
+        style="@style/HelpAnswer" />
+      <TextView
+        android:text="@string/help_share_friends_question"
+        style="@style/HelpQuestion" />
+      <TextView
+        android:text="@string/help_share_friends_answer"
+        style="@style/HelpAnswer" />
+      <TextView
+        android:text="@string/help_share_visibility_question"
+        style="@style/HelpQuestion" />
+      <TextView
+        android:text="@string/help_share_visibility_answer"
+        style="@style/HelpAnswer" />
+      <TextView
+        android:text="@string/help_split_track_question"
+        style="@style/HelpQuestion" />
+      <TextView
+        android:text="@string/help_split_track_answer"
+        style="@style/HelpAnswer" />
+      <TextView
+        android:text="@string/help_saved_files_question"
+        style="@style/HelpQuestion" />
+      <TextView
+        android:text="@string/help_saved_files_answer"
+        style="@style/HelpAnswer" />
+      <TextView
+        android:text="@string/help_waypoint_marker_question"
+        style="@style/HelpQuestion" />
+      <TextView
+        android:text="@string/help_waypoint_marker_answer"
+        style="@style/HelpAnswer" />
+      <TextView
+        android:text="@string/help_statistics_marker_question"
+        style="@style/HelpQuestion" />
+      <TextView
+        android:text="@string/help_statistics_marker_answer"
+        style="@style/HelpAnswer" />
+      <TextView
+        android:text="@string/help_delete_tracks_question"
+        style="@style/HelpQuestion" />
+      <TextView
+        android:text="@string/help_delete_tracks_answer"
+        style="@style/HelpAnswer" />
+      <TextView
+        android:text="@string/help_edit_tracks_question"
+        style="@style/HelpQuestion" />
+      <TextView
+        android:text="@string/help_edit_tracks_answer"
+        style="@style/HelpAnswer" />
+    </LinearLayout>
   </ScrollView>
   <LinearLayout style="@style/BottomButtonBar" >
     <include layout="@layout/help_buttons" />

MyTracks/res/layout/help_content.xml

@@ -1,114 +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.
--->
-<merge xmlns:android="http://schemas.android.com/apk/res/android" >
-  <LinearLayout
-    android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
-    android:orientation="vertical"
-    android:padding="8dp" >
-    <ImageView
-      android:contentDescription="@string/my_tracks_app_name"
-      android:layout_height="wrap_content"
-      android:layout_width="wrap_content"
-      android:scaleType="fitStart"
-      android:src="@drawable/arrow_icon" />
-    <TextView
-      android:text="@string/help_my_tracks_question"
-      style="@style/WelcomeQuestionTextView" />
-    <TextView
-      android:text="@string/help_my_tracks_answer"
-      style="@style/WelcomeAnswerTextView" />
-    <TextView
-      android:text="@string/help_location_precision_question"
-      style="@style/WelcomeQuestionTextView" />
-    <TextView
-      android:text="@string/help_location_precision_answer"
-      style="@style/WelcomeAnswerTextView" />
-    <TextView
-      android:text="@string/help_gps_fix_question"
-      style="@style/WelcomeQuestionTextView" />
-    <TextView
-      android:text="@string/help_gps_fix_answer"
-      style="@style/WelcomeAnswerTextView" />
-    <TextView
-      android:text="@string/help_data_connection_question"
-      style="@style/WelcomeQuestionTextView" />
-    <TextView
-      android:text="@string/help_data_connection_answer"
-      style="@style/WelcomeAnswerTextView" />
-    <TextView
-      android:text="@string/help_elevation_precision_question"
-      style="@style/WelcomeQuestionTextView" />
-    <TextView
-      android:text="@string/help_elevation_precision_answer"
-      style="@style/WelcomeAnswerTextView" />
-    <TextView
-      android:text="@string/help_battery_life_question"
-      style="@style/WelcomeQuestionTextView" />
-    <TextView
-      android:text="@string/help_battery_life_answer"
-      style="@style/WelcomeAnswerTextView" />
-    <TextView
-      android:text="@string/help_share_friends_question"
-      style="@style/WelcomeQuestionTextView" />
-    <TextView
-      android:text="@string/help_share_friends_answer"
-      style="@style/WelcomeAnswerTextView" />
-    <TextView
-      android:text="@string/help_share_visibility_question"
-      style="@style/WelcomeQuestionTextView" />
-    <TextView
-      android:text="@string/help_share_visibility_answer"
-      style="@style/WelcomeAnswerTextView" />
-    <TextView
-      android:text="@string/help_split_track_question"
-      style="@style/WelcomeQuestionTextView" />
-    <TextView
-      android:text="@string/help_split_track_answer"
-      style="@style/WelcomeAnswerTextView" />
-    <TextView
-      android:text="@string/help_saved_files_question"
-      style="@style/WelcomeQuestionTextView" />
-    <TextView
-      android:text="@string/help_saved_files_answer"
-      style="@style/WelcomeAnswerTextView" />
-    <TextView
-      android:text="@string/help_waypoint_marker_question"
-      style="@style/WelcomeQuestionTextView" />
-    <TextView
-      android:text="@string/help_waypoint_marker_answer"
-      style="@style/WelcomeAnswerTextView" />
-    <TextView
-      android:text="@string/help_statistics_marker_question"
-      style="@style/WelcomeQuestionTextView" />
-    <TextView
-      android:text="@string/help_statistics_marker_answer"
-      style="@style/WelcomeAnswerTextView" />
-    <TextView
-      android:text="@string/help_delete_tracks_question"
-      style="@style/WelcomeQuestionTextView" />
-    <TextView
-      android:text="@string/help_delete_tracks_answer"
-      style="@style/WelcomeAnswerTextView" />
-    <TextView
-      android:text="@string/help_edit_tracks_question"
-      style="@style/WelcomeQuestionTextView" />
-    <TextView
-      android:text="@string/help_edit_tracks_answer"
-      style="@style/WelcomeAnswerTextView" />
-  </LinearLayout>
-</merge>

MyTracks/res/layout/list_item.xml

@@ -26,29 +26,34 @@ limitations under the License.
     android:layout_width="fill_parent"
     android:orientation="horizontal" >
     <TextView
-      android:id="@+id/track_list_item_name"
+      android:id="@+id/list_item_name"
-      style="@style/ListItemName" />
+      android:singleLine="true"
+      style="@style/TextLarge.WithIcon" />
     <TextView
-      android:id="@+id/track_list_item_category"
+      android:id="@+id/list_item_category"
-      style="@style/ListItemCategory" />
+      android:layout_marginLeft="8dp"
+      android:singleLine="true"
+      style="@style/TextSmall" />
   </LinearLayout>
   <LinearLayout
     android:layout_height="wrap_content"
     android:layout_width="fill_parent"
     android:orientation="horizontal" >
     <TextView
-      android:id="@+id/track_list_item_time"
+      android:id="@+id/list_item_total_time"
-      style="@style/ListItemStat" />
+      android:layout_marginRight="8dp"
+      style="@style/ListItemStats" />
     <TextView
-      android:id="@+id/track_list_item_distance"
+      android:id="@+id/list_item_total_distance"
-      android:layout_marginLeft="8dp"
+      android:layout_marginRight="8dp"
-      style="@style/ListItemStat" />
+      style="@style/ListItemStats" />
     <TextView
-      android:id="@+id/track_list_item_start"
+      android:id="@+id/list_item_start_time"
-      android:layout_marginLeft="8dp"
+      style="@style/ListItemStats" />
-      style="@style/ListItemStat" />
   </LinearLayout>
   <TextView
-    android:id="@+id/track_list_item_description"
+    android:id="@+id/list_item_description"
-    style="@style/ListItemDescription" />
+    android:singleLine="false"
+    android:textColor="@android:color/secondary_text_dark"
+    style="@style/TextSmall" />
 </LinearLayout>

MyTracks/res/layout/map.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2010 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"
+  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" />
+  <ImageButton
+    android:background="@drawable/my_location"
+    android:contentDescription="@string/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"
+    android:gravity="center"
+    android:id="@+id/map_message"
+    android:layout_alignParentTop="true"
+    android:layout_width="fill_parent"
+    android:padding="8dp"
+    android:textColor="@android:color/primary_text_dark"
+    android:visibility="gone"
+    style="@style/TextMedium.WithIcon" />
+</RelativeLayout>

MyTracks/res/layout/marker_add.xml

@@ -0,0 +1,46 @@
+<?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_detail.xml

@@ -15,8 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
+  style="@style/ScrollView" >
-  android:layout_width="fill_parent" >
   <LinearLayout
     android:layout_height="wrap_content"
     android:layout_width="fill_parent"
@@ -24,139 +23,27 @@ limitations under the License.
     android:padding="8dp" >
     <TextView
       android:id="@+id/marker_detail_name"
-      style="@style/MarkerDetailLabel" />
+      style="@style/TextLarge" />
     <LinearLayout
       android:id="@+id/marker_detail_waypoint_section"
       android:layout_height="wrap_content"
       android:layout_width="fill_parent"
       android:orientation="vertical" >
       <TextView
-        android:id="@+id/marker_detail_marker_type"
+        android:id="@+id/marker_detail_waypoint_marker_type"
-        style="@style/MarkerDetailLabel" />
+        style="@style/TextLarge" />
       <TextView
-        android:id="@+id/marker_detail_description"
+        android:id="@+id/marker_detail_waypoint_description"
-        style="@style/MarkerDetailLabel" />
+        style="@style/TextLarge" />
     </LinearLayout>
     <TableLayout
       android:id="@+id/marker_detail_statistics_section"
       android:layout_height="wrap_content"
       android:layout_width="fill_parent"
+      android:paddingTop="8dp"
       android:shrinkColumns="0,2"
       android:stretchColumns="0,2" >
-      <!-- Total distance and max speed (fastest pace) -->
+      <include layout="@layout/stats_core" />
-      <TableRow>
-        <TextView
-          android:text="@string/stat_total_distance"
-          style="@style/MarkerDetailStatisticsLabel" />
-        <TextView
-          android:id="@+id/marker_detail_max_speed_label"
-          android:layout_column="2"
-          style="@style/MarkerDetailStatisticsLabel" />
-      </TableRow>
-      <TableRow>
-        <TextView
-          android:id="@+id/marker_detail_total_distance_value"
-          style="@style/MarkerDetailStatisticsValue" />
-        <TextView style="@style/MarkerDetailStatisticsSpacer" />
-        <TextView
-          android:id="@+id/marker_detail_max_speed_value"
-          style="@style/MarkerDetailStatisticsValue" />
-      </TableRow>
-      <!-- Total time and average speed (average pace) -->
-      <TableRow>
-        <TextView
-          android:text="@string/stat_total_time"
-          style="@style/MarkerDetailStatisticsLabel" />
-        <TextView
-          android:id="@+id/marker_detail_average_speed_label"
-          android:layout_column="2"
-          style="@style/MarkerDetailStatisticsLabel" />
-      </TableRow>
-      <TableRow>
-        <TextView
-          android:id="@+id/marker_detail_total_time_value"
-          style="@style/MarkerDetailStatisticsValue" />
-        <TextView style="@style/MarkerDetailStatisticsSpacer" />
-        <TextView
-          android:id="@+id/marker_detail_average_speed_value"
-          style="@style/MarkerDetailStatisticsValue" />
-      </TableRow>
-      <!-- Moving time and average moving speed (average moving pace) -->
-      <TableRow>
-        <TextView
-          android:text="@string/stat_moving_time"
-          style="@style/MarkerDetailStatisticsLabel" />
-        <TextView
-          android:id="@+id/marker_detail_average_moving_speed_label"
-          android:layout_column="2"
-          style="@style/MarkerDetailStatisticsLabel" />
-      </TableRow>
-      <TableRow>
-        <TextView
-          android:id="@+id/marker_detail_moving_time_value"
-          style="@style/MarkerDetailStatisticsValue" />
-        <TextView style="@style/MarkerDetailStatisticsSpacer" />
-        <TextView
-          android:id="@+id/marker_detail_average_moving_speed_value"
-          style="@style/MarkerDetailStatisticsValue" />
-      </TableRow>
-      <!-- Elevation and elevation gain -->
-      <TableRow>
-        <TextView
-          android:text="@string/stat_elevation"
-          style="@style/MarkerDetailStatisticsLabel" />
-        <TextView
-          android:layout_column="2"
-          android:text="@string/stat_elevation_gain"
-          style="@style/MarkerDetailStatisticsLabel" />
-      </TableRow>
-      <TableRow>
-        <TextView
-          android:id="@+id/marker_detail_elevation_value"
-          style="@style/MarkerDetailStatisticsValue" />
-        <TextView style="@style/MarkerDetailStatisticsSpacer" />
-        <TextView
-          android:id="@+id/marker_detail_elevation_gain_value"
-          style="@style/MarkerDetailStatisticsValue" />
-      </TableRow>
-      <!-- Min and max elevation -->
-      <TableRow>
-        <TextView
-          android:text="@string/stat_min_elevation"
-          style="@style/MarkerDetailStatisticsLabel" />
-        <TextView
-          android:layout_column="2"
-          android:text="@string/stat_max_elevation"
-          style="@style/MarkerDetailStatisticsLabel" />
-      </TableRow>
-      <TableRow>
-        <TextView
-          android:id="@+id/marker_detail_min_elevation_value"
-          style="@style/MarkerDetailStatisticsValue" />
-        <TextView style="@style/MarkerDetailStatisticsSpacer" />
-        <TextView
-          android:id="@+id/marker_detail_max_elevation_value"
-          style="@style/MarkerDetailStatisticsValue" />
-      </TableRow>
-      <!-- Min and max grade -->
-      <TableRow>
-        <TextView
-          android:text="@string/stat_min_grade"
-          style="@style/MarkerDetailStatisticsLabel" />
-        <TextView
-          android:layout_column="2"
-          android:text="@string/stat_max_grade"
-          style="@style/MarkerDetailStatisticsLabel" />
-      </TableRow>
-      <TableRow>
-        <TextView
-          android:id="@+id/marker_detail_min_grade_value"
-          style="@style/MarkerDetailStatisticsValue" />
-        <TextView style="@style/MarkerDetailStatisticsSpacer" />
-        <TextView
-          android:id="@+id/marker_detail_max_grade_value"
-          style="@style/MarkerDetailStatisticsValue" />
-      </TableRow>
     </TableLayout>
   </LinearLayout>
 </ScrollView>

MyTracks/res/layout/marker_edit.xml

@@ -18,10 +18,7 @@ limitations under the License.
   android:layout_height="fill_parent"
   android:layout_width="fill_parent"
   android:orientation="vertical" >
-  <ScrollView
+  <ScrollView style="@style/ScrollView.WithBottomButtons" >
-    android:layout_height="0dp"
-    android:layout_weight="1"
-    android:layout_width="fill_parent" >
     <LinearLayout
       android:layout_height="wrap_content"
       android:layout_width="fill_parent"
@@ -33,48 +30,62 @@ limitations under the License.
         android:layout_width="fill_parent"
         android:orientation="vertical" >
         <TextView
-          android:text="@string/marker_edit_type"
+          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_type_statistics"
+            android:id="@+id/marker_edit_statistics"
-            android:text="@string/marker_edit_type_statistics"
+            android:text="@string/marker_statistics"
-            style="@style/EditLabel" />
+            style="@style/TextMedium" />
           <RadioButton
-            android:id="@+id/marker_edit_type_waypoint"
+            android:id="@+id/marker_edit_waypoint"
-            android:text="@string/marker_edit_type_waypoint"
+            android:text="@string/marker_waypoint"
-            style="@style/EditLabel" />
+            style="@style/TextMedium" />
         </RadioGroup>
       </LinearLayout>
       <TextView
         android:text="@string/generic_name"
         style="@style/EditLabel" />
-      <EditText
+      <LinearLayout
-        android:hint="@string/generic_name"
+        android:id="@+id/marker_edit_statistics_section"
-        android:id="@+id/marker_edit_name"
+        android:layout_height="wrap_content"
-        style="@style/EditName" />
+        android:layout_width="fill_parent"
+        android:orientation="vertical" >
+        <EditText
+          android:drawableLeft="@drawable/yellow_pushpin"
+          android:hint="@string/generic_name"
+          android:id="@+id/marker_edit_statistics_name"
+          android:imeOptions="actionDone"
+          style="@style/EditName" />
+      </LinearLayout>
       <LinearLayout
         android:id="@+id/marker_edit_waypoint_section"
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
         android:orientation="vertical" >
+        <EditText
+          android:drawableLeft="@drawable/blue_pushpin"
+          android:hint="@string/generic_name"
+          android:id="@+id/marker_edit_waypoint_name"
+          android:imeOptions="actionNext"
+          style="@style/EditName" />
         <TextView
-          android:text="@string/marker_edit_marker_type"
+          android:text="@string/marker_edit_waypoint_marker_type"
-          style="@style/EditLabel" />
+          style="@style/EditLabel.WithPaddingTop" />
         <AutoCompleteTextView
-          android:hint="@string/marker_edit_marker_type_hint"
+          android:hint="@string/marker_edit_waypoint_marker_type_hint"
-          android:id="@+id/marker_edit_marker_type"
+          android:id="@+id/marker_edit_waypoint_marker_type"
           android:imeOptions="actionNext"
           style="@style/EditCategory" />
         <TextView
           android:text="@string/generic_description"
-          style="@style/EditLabel" />
+          style="@style/EditLabel.WithPaddingTop" />
         <EditText
           android:hint="@string/generic_description"
-          android:id="@+id/marker_edit_description"
+          android:id="@+id/marker_edit_waypoint_description"
           android:imeOptions="actionDone"
           style="@style/EditDescription" />
       </LinearLayout>

MyTracks/res/layout/marker_list.xml

@@ -14,7 +14,7 @@ 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"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_height="fill_parent"
   android:layout_width="fill_parent" >
   <ListView
@@ -22,13 +22,8 @@ limitations under the License.
     android:layout_height="fill_parent"
     android:layout_width="fill_parent" />
   <TextView
-    android:layout_gravity="center"
-    android:gravity="center"
     android:id="@+id/marker_list_empty"
-    android:layout_height="wrap_content"
-    android:layout_width="wrap_content"
-    android:paddingBottom="8dp"
     android:text="@string/marker_list_empty_message"
-    style="@android:style/TextAppearance.DeviceDefault.Large" >
+    style="@style/ListEmptyTextView" >
   </TextView>
-</FrameLayout>
+</merge>

MyTracks/res/layout/mytracks_charts.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 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"
-  android:id="@+id/elevation_root"
-  android:orientation="vertical"
-  android:layout_height="fill_parent"
-  android:layout_width="fill_parent">
-  <LinearLayout android:id="@+id/elevation_chart"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-  </LinearLayout>
-  <RelativeLayout android:id="@+id/elevation_zoom_layout"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:padding="10dp">
-    <ZoomControls android:id="@+id/elevation_zoom"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center_horizontal"
-      android:layout_alignParentBottom="true"
-      android:layout_centerHorizontal="true"
-      android:layout_alignParentRight="true"/>
-  </RelativeLayout>
-  <LinearLayout android:id="@+id/elevation_busypane"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:padding="3dp"
-    android:visibility="gone">
-    <ProgressBar
-      android:layout_weight="1"
-      android:layout_height="0dp"
-      android:layout_width="wrap_content"
-      android:maxWidth="80dp"
-      android:maxHeight="80dp"
-      android:minWidth="80dp"
-      android:minHeight="80dp"
-      android:layout_gravity="center"/>
-  </LinearLayout>
-</RelativeLayout>

MyTracks/res/layout/mytracks_layout.xml

@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 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"
-  android:id="@+id/screen"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent">
-  <com.google.android.maps.MapView android:id="@+id/map"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:clickable="true"
-    android:enabled="true"
-    android:focusable="true"
-    android:focusableInTouchMode="true"
-    android:apiKey="0TXoRmxTinrZKQ9JSazj-9A34XX6_lXsRvTpXWA"/>
-    <!-- corresponding certificate md5: 81:DF:A2:63:53:C7:6B:1E:6C:24:62:D4:91:1C:36:3A -->
-  <LinearLayout android:id="@+id/messagepane"
-    android:orientation="horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/list_bar"
-    android:padding="3dp"
-    android:visibility="gone">
-    <TextView android:id="@+id/messagetext"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:textSize="16dp"
-      android:textColor="#fff"
-      android:text="@string/gps_wait_for_fix"
-      android:layout_weight="1"/>
-    </LinearLayout>
-    <LinearLayout android:id="@+id/busypane"
-      android:orientation="vertical"
-      android:layout_width="fill_parent"
-      android:layout_height="fill_parent"
-      android:padding="3dp"
-      android:visibility="gone">
-      <ProgressBar
-        android:layout_weight="1"
-        android:layout_height="0dp"
-        android:layout_width="wrap_content"
-        android:maxWidth="80dp"
-        android:maxHeight="80dp"
-        android:minWidth="80dp"
-        android:minHeight="80dp"
-        android:layout_gravity="center"/>
-    </LinearLayout>
-</RelativeLayout>

MyTracks/res/layout/mytracks_list_item.xml

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 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="wrap_content"
-  android:layout_width="fill_parent"
-  android:minHeight="?android:attr/listPreferredItemHeight"
-  android:orientation="vertical"
-  android:paddingBottom="2dp"
-  android:paddingTop="2dp">
-
-  <LinearLayout
-    android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
-    android:orientation="horizontal">
-    <ImageView android:id="@+id/track_list_item_icon"
-      android:contentDescription="@string/track_icon_description"
-      android:layout_height="wrap_content"
-      android:layout_width="wrap_content"
-      android:paddingLeft="4dp"
-      android:paddingRight="2dp"
-      android:paddingTop="5dp"
-      android:src="@drawable/track" />
-    <TextView android:id="@+id/track_list_item_name"
-      android:layout_height="wrap_content"
-      android:layout_marginLeft="6dp"
-      android:layout_marginTop="6dp"
-      android:layout_width="wrap_content"
-      android:singleLine="true"
-      android:textAppearance="?android:attr/textAppearanceLarge"/>
-    <TextView android:id="@+id/track_list_item_category"
-      android:layout_height="wrap_content"
-      android:layout_marginLeft="6dp"
-      android:layout_marginTop="6dp"
-      android:layout_width="fill_parent"
-      android:singleLine = "true"
-      android:textAppearance="?android:attr/textAppearanceSmall"/>
-  </LinearLayout>
-
-  <TextView android:id="@+id/track_list_item_time"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginLeft="6dp"
-    android:singleLine="true"
-    android:textColor="#fff"
-    android:textAppearance="?android:attr/textAppearanceSmall"/>
-  <TextView android:id="@+id/track_list_item_stats"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginLeft="6dp"
-    android:singleLine="true"
-    android:textColor="#0f0"
-    android:textAppearance="?android:attr/textAppearanceSmall"/>
-  <TextView android:id="@+id/track_list_item_description"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginLeft = "6dp"
-    android:singleLine = "false"
-    android:textAppearance="?android:attr/textAppearanceSmall"/>
-
-</LinearLayout>

MyTracks/res/layout/search_list.xml

@@ -14,21 +14,16 @@ 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"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apl/res/com.google.android.apps.mytracks"
+  android:layout_height="fill_parent"
-  android:orientation="vertical"
+  android:layout_width="fill_parent" >
-  android:layout_width="fill_parent"
+  <ListView
-  android:layout_height="fill_parent">
+    android:id="@+id/search_list"
-  <ListView android:id="@android:id/list"
     android:layout_height="fill_parent"
     android:layout_width="fill_parent" />
-  <TextView android:id="@android:id/empty"
+  <TextView
-    android:gravity="center"
+    android:id="@+id/search_list_empty"
-    android:layout_height="fill_parent"
+    android:text="@string/search_list_empty_message"
-    android:layout_width="fill_parent"
+    style="@style/ListEmptyTextView" >
-    android:text="@string/search_no_results"
+  </TextView>
-    android:textColor="@android:color/white"
+</merge>
-    android:textSize="20dp"
-    android:textStyle="bold"
-    android:visibility="gone" />
-</LinearLayout>

MyTracks/res/layout/sensor_state.xml

@@ -14,67 +14,53 @@ 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
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:android="http://schemas.android.com/apk/res/android"
+  style="@style/ScrollView" >
-  android:layout_height="fill_parent"
+  <LinearLayout
-  android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
-  android:orientation="vertical">
+    android:layout_width="fill_parent"
-  <ScrollView
+    android:orientation="vertical"
-    android:layout_height="0dp"
+    android:padding="8dp" >
-    android:layout_weight="1"
+    <TextView
-    android:layout_width="fill_parent">
+      android:text="@string/menu_sensor_state"
-    <LinearLayout 
+      style="@style/TextMedium" />
-      android:layout_height="wrap_content"
+    <TextView
-      android:layout_width="fill_parent"
+      android:id="@+id/sensor_state"
-      android:orientation="vertical">
+      style="@style/SensorStateValue" />
-
+    <!-- Last sensor time -->
-      <!-- Sensor state -->
+    <TextView
-      <TextView
+      android:text="@string/sensor_state_last_sensor_time"
-        android:text="@string/menu_sensor_state"
+      style="@style/TextMedium" />
-        style="@style/SensorStateLabel"/>
+    <TextView
-      <TextView
+      android:id="@+id/sensor_state_last_sensor_time"
-        android:id="@+id/sensor_state"
+      style="@style/SensorStateValue" />
-        style="@style/SensorStateValue"/>
+    <!-- Power -->
-  
+    <TextView
-      <!--  Last sensor time -->
+      android:text="@string/sensor_state_power"
-      <TextView
+      style="@style/TextMedium" />
-        android:text="@string/sensor_state_last_sensor_time"
+    <TextView
-        style="@style/SensorStateLabel"/>
+      android:id="@+id/sensor_state_power"
-      <TextView
+      style="@style/SensorStateValue" />
-        android:id="@+id/sensor_state_last_sensor_time"
+    <!-- Cadence -->
-        style="@style/SensorStateValue"/>
+    <TextView
-  
+      android:text="@string/sensor_state_cadence"
-      <!-- Power -->
+      style="@style/TextMedium" />
-      <TextView
+    <TextView
-        android:text="@string/sensor_state_power"
+      android:id="@+id/sensor_state_cadence"
-        style="@style/SensorStateLabel"/>
+      style="@style/SensorStateValue" />
-      <TextView
+    <!-- Heart rate -->
-        android:id="@+id/sensor_state_power"
+    <TextView
-        style="@style/SensorStateValue"/>
+      android:text="@string/sensor_state_heart_rate"
-  
+      style="@style/TextMedium" />
-      <!-- Cadence -->
+    <TextView
-      <TextView
+      android:id="@+id/sensor_state_heart_rate"
-        android:text="@string/sensor_state_cadence"
+      style="@style/SensorStateValue" />
-        style="@style/SensorStateLabel"/>
+    <!-- Battery level -->
-      <TextView
+    <TextView
-        android:id="@+id/sensor_state_cadence"
+      android:text="@string/sensor_state_battery"
-        style="@style/SensorStateValue"/>
+      style="@style/TextMedium" />
-  
+    <TextView
-      <!-- Heart rate -->
+      android:id="@+id/sensor_state_battery"
-      <TextView
+      style="@style/SensorStateValue" />
-        android:text="@string/sensor_state_heart_rate"
+  </LinearLayout>
-        style="@style/SensorStateLabel"/>
+</ScrollView>
-      <TextView
-        android:id="@+id/sensor_state_heart_rate"
-        style="@style/SensorStateValue"/>
-  
-      <!-- Battery level -->
-      <TextView
-        android:text="@string/sensor_state_battery"
-        style="@style/SensorStateLabel"/>
-      <TextView
-        android:id="@+id/sensor_state_battery"
-        style="@style/SensorStateValue"/>
-    </LinearLayout>
-  </ScrollView>
-</LinearLayout>

MyTracks/res/layout/stats.xml

@@ -14,349 +14,43 @@ 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
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:android="http://schemas.android.com/apk/res/android"
+  style="@style/ScrollView" >
-  android:id="@+id/stats_root"
+  <TableLayout
-  android:layout_height="wrap_content"
-  android:orientation="horizontal"
-  android:layout_width="fill_parent">
-
-  <ScrollView
-    android:id="@+id/scrolly"
     android:layout_height="wrap_content"
-    android:layout_width="fill_parent">
-
-    <TableLayout
-      android:id="@+id/stats_table"
-      android:layout_height="wrap_content"
-      android:stretchColumns="1,4"
-      android:layout_width="fill_parent">
-
-      <!--  Layout the speed large on it's own line. -->
-      <TableRow>
-        <TextView
-          android:id="@+id/speed_label"
-          android:layout_span="5"
-          android:text="@string/stat_speed" />
-      </TableRow>
-      <TableRow
-        android:background="@color/stat_label_background">
-        <TextView
-          style="@style/StatsRegister.Big"
-          android:id="@+id/speed_register"
-          android:layout_column="1"
-          android:layout_span="4"/>
-        <LinearLayout
-          android:gravity="bottom"
-          android:layout_column="5"
-          android:layout_width="wrap_content"
-          android:lines="1"
-          android:orientation="vertical">
-          <TextView
-            android:layout_height="fill_parent"
-            android:layout_width="fill_parent" />
-          <TextView
-            android:id="@+id/speed_unit_label_top"
-	          style="@style/StatsUnit" />
-          <TextView
-	          style="@style/StatsDivider" />
-          <TextView
-            android:id="@+id/speed_unit_label_bottom"
-	          style="@style/StatsUnit" />
-        </LinearLayout>
-      </TableRow>
-
-      <!-- Total distance and max speed -->
-      <TableRow
-        android:padding="1dp">
-        <TextView
-          android:id="@+id/total_distance_label"
-          android:layout_column="1"
-          android:layout_span="3"
-          android:text="@string/stat_total_distance" />
-        <TextView
-          android:id="@+id/max_speed_label"
-          android:layout_column="4"
-          android:layout_span="2"
-          android:text="@string/stat_max_speed" />
-      </TableRow>
-      <TableRow
-        android:background="@color/stat_label_background">
-        <TextView
-          style="@style/StatsRegister"
-          android:id="@+id/total_distance_register"
-          android:layout_column="1" />
-        <TextView
-          android:id="@+id/total_distance_unit_label"
-          android:layout_column="2"
-	        style="@style/StatsUnitSolo" />
-        <!-- TODO 4/08/2009
-        The following is a bad hack to get a spacer the same size as the
-        text.  Ideally this should just be a View, however I don't know how to
-        set the view height properly.  fill_parent on this element causes as
-        NullPointerException. This same filler is repeated on each line.-->
-        <TextView
-          style="@style/StatsSpacer"
-          android:layout_column="3"/>
-        <TextView
-          android:id="@+id/max_speed_register"
-          style="@style/StatsRegister"
-          android:layout_column="4" />
-        <LinearLayout
-          android:gravity="bottom"
-          android:layout_column="5"
-          android:layout_width="wrap_content"
-          android:lines="1"
-          android:orientation="vertical">
-          <TextView
-            android:id="@+id/max_speed_unit_label_top"
-            style="@style/StatsUnit" />
-          <TextView
-	          style="@style/StatsDivider" />
-          <TextView
-            android:id="@+id/max_speed_unit_label_bottom"
-            style="@style/StatsUnit" />
-        </LinearLayout>
-      </TableRow>
-
-      <!-- Total time and average speed -->
-      <TableRow>
-        <TextView
-          android:id="@+id/track_time_label"
-          android:layout_column="1"
-          android:layout_span="3"
-          android:text="@string/stat_total_time" />
-        <TextView
-          android:id="@+id/average_speed_label"
-          android:layout_column="4"
-          android:layout_span="2"
-          android:text="@string/stat_average_speed" />
-      </TableRow>
-      <TableRow
-        android:background="@color/stat_label_background">
-        <TextView
-          android:id="@+id/total_time_register"
-          android:layout_column="1"
-          android:layout_height="wrap_content"
-          android:layout_span="2"
-          android:layout_width="fill_parent"
-          style="@style/StatsRegister" />
-        <TextView
-          style="@style/StatsSpacer"
-          android:layout_column="3"/>
-        <TextView
-          android:id="@+id/average_speed_register"
-          android:layout_column="4"
-          style="@style/StatsRegister" />
-        <LinearLayout
-          android:gravity="bottom"
-          android:layout_column="5"
-          android:layout_width="wrap_content"
-          android:lines="1"
-          android:orientation="vertical">
-          <TextView
-            android:id="@+id/average_speed_unit_label_top"
-            style="@style/StatsUnit" />
-          <TextView
-	          style="@style/StatsDivider" />
-          <TextView
-            android:id="@+id/average_speed_unit_label_bottom"
-            style="@style/StatsUnit" />
-        </LinearLayout>
-      </TableRow>
-
-      <!-- Moving time and average moving speed -->
-      <TableRow>
-        <TextView
-          android:id="@+id/moving_time_label"
-          android:layout_column="1"
-          android:layout_span="3"
-          android:text="@string/stat_moving_time" />
-        <TextView
-          android:id="@+id/average_moving_speed_label"
-          android:layout_column="4"
-          android:layout_span="2"
-          android:text="@string/stat_average_moving_speed" />
-      </TableRow>
-      <TableRow
-        android:background="@color/stat_label_background">
-        <TextView
-          android:id="@+id/moving_time_register"
-          android:layout_column="1"
-          android:layout_height="wrap_content"
-          android:layout_span="2"
-          android:layout_width="fill_parent"
-          style="@style/StatsRegister" />
-        <TextView
-          style="@style/StatsSpacer"
-          android:layout_column="3"/>
-        <TextView
-          android:id="@+id/average_moving_speed_register"
-          style="@style/StatsRegister" />
-        <LinearLayout
-          android:gravity="bottom"
-          android:layout_column="5"
-          android:layout_width="wrap_content"
-          android:lines="1"
-          android:orientation="vertical">
-          <TextView
-            android:id="@+id/average_moving_speed_unit_label_top"
-            style="@style/StatsUnit" />
-          <TextView
-	          style="@style/StatsDivider" />
-          <TextView
-            android:id="@+id/average_moving_speed_unit_label_bottom"
-            style="@style/StatsUnit" />
-        </LinearLayout>
-      </TableRow>
-
-      <!-- Elevation and elevation gain -->
-      <TableRow>
-        <TextView
-          android:id="@+id/elevation_label"
-          android:layout_column="1"
-          android:layout_span="3"
-          android:text="@string/stat_elevation" />
-        <TextView
-          android:id="@+id/elevation_gain_label"
-          android:layout_column="4"
-          android:layout_span="2"
-          android:text="@string/stat_elevation_gain" />
-      </TableRow>
-      <TableRow
-        android:background="@color/stat_label_background">
-        <TextView
-          android:id="@+id/elevation_register"
-          android:layout_column="1"
-          style="@style/StatsRegister" />
-        <TextView
-          android:id="@+id/elevation_unit_label"
-          android:layout_column="2"
-          style="@style/StatsUnitSolo" />
-        <TextView
-          style="@style/StatsSpacer"
-          android:layout_column="3"/>
-        <TextView
-          android:id="@+id/elevation_gain_register"
-          android:layout_column="4"
-          style="@style/StatsRegister" />
-        <TextView
-          android:id="@+id/elevation_gain_unit_label"
-          android:layout_column="5"
-          style="@style/StatsUnitSolo" />
-      </TableRow>
-
-      <!-- Min and max elevation -->
-      <TableRow>
-        <TextView
-          android:id="@+id/min_elevation_label"
-          android:layout_column="1"
-          android:layout_span="3"
-          android:text="@string/stat_min_elevation" />
-        <TextView
-          android:id="@+id/max_elevation_label"
-          android:layout_column="4"
-          android:layout_span="3"
-          android:text="@string/stat_max_elevation" />
-      </TableRow>
-      <TableRow
-        android:background="@color/stat_label_background">
-        <TextView
-          android:id="@+id/min_elevation_register"
-          android:layout_column="1"
-          style="@style/StatsRegister" />
-        <TextView
-          android:id="@+id/min_elevation_unit_label"
-          android:layout_column="2"
-          style="@style/StatsUnitSolo" />
-        <TextView
-          style="@style/StatsSpacer"
-          android:layout_column="3"/>
-        <TextView
-          android:id="@+id/max_elevation_register"
-          android:layout_column="4"
-          style="@style/StatsRegister" />
-        <TextView
-          android:id="@+id/max_elevation_unit_label"
-          android:layout_column="5"
-          style="@style/StatsUnitSolo" />
-      </TableRow>
-
-      <!-- Min and max grade -->
-      <TableRow>
-        <TextView
-          android:id="@+id/min_grade_label"
-          android:layout_column="1"
-          android:layout_span="3"
-          android:text="@string/stat_min_grade" />
-        <TextView
-          android:id="@+id/max_grade_label"
-          android:layout_column="4"
-          android:layout_span="2"
-          android:text="@string/stat_max_grade" />
-      </TableRow>
-      <TableRow
-        android:background="@color/stat_label_background">
-        <TextView
-          android:id="@+id/min_grade_register"
-          android:layout_column="1"
-          android:layout_span="2"
-          style="@style/StatsRegister" />
-        <TextView
-          style="@style/StatsSpacer"
-          android:layout_column="3"/>
-        <TextView
-          android:id="@+id/max_grade_register"
-          android:layout_column="4"
-          android:layout_span="2"
-          style="@style/StatsRegister" />
-      </TableRow>
-
-      <!-- Latitude and Longitude -->
-      <TableRow>
-        <TextView
-          android:layout_column="1"
-          android:layout_span="3"
-          android:text="@string/stat_latitude" />
-        <TextView
-          android:layout_column="4"
-          android:layout_span="2"
-          android:text="@string/stat_longitude" />
-      </TableRow>
-      <TableRow
-        android:background="@color/stat_label_background">
-        <TextView
-          android:id="@+id/latitude_register"
-          android:layout_column="1"
-          android:layout_span="2"
-          style="@style/StatsRegister.Small" />
-        <TextView
-          style="@style/StatsSpacer"
-          android:layout_column="3"
-          android:textSize="25sp" />
-        <TextView
-          android:id="@+id/longitude_register"
-          android:layout_column="4"
-          android:layout_span="2"
-          style="@style/StatsRegister.Small" />
-      </TableRow>
-
-    </TableLayout>
-  </ScrollView>
-  <LinearLayout android:id="@+id/stats_busypane"
-    android:orientation="vertical"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:padding="8dp"
-    android:padding="3dp"
+    android:shrinkColumns="0,2"
-    android:visibility="gone">
+    android:stretchColumns="0,2" >
-    <ProgressBar
+    <!-- Speed on one line -->
-      android:layout_weight="1"
+    <TableRow>
-      android:layout_height="0dp"
+      <TextView
-      android:layout_width="wrap_content"
+        android:id="@+id/stats_speed_label"
-      android:maxWidth="80dp"
+        style="@style/StatsLabel" />
-      android:maxHeight="80dp"
+    </TableRow>
-      android:minWidth="80dp"
+    <TableRow>
-      android:minHeight="80dp"
+      <TextView
-      android:layout_gravity="center"/>
+        android:id="@+id/stats_speed_value"
-  </LinearLayout>
+        style="@style/StatsValue" />
-</RelativeLayout>
+    </TableRow>
+    <include layout="@layout/stats_core" />
+    <TableRow android:id="@+id/stats_coordinate_label_table_row" >
+      <TextView
+        android:text="@string/stats_latitude"
+        style="@style/StatsLabel" />
+      <TextView
+        android:layout_column="2"
+        android:text="@string/stats_longitude"
+        style="@style/StatsLabel" />
+    </TableRow>
+    <TableRow android:id="@+id/stats_coordinate_value_table_row" >
+      <TextView
+        android:id="@+id/stats_latitude_value"
+        style="@style/StatsValue" />
+      <TextView style="@style/StatsSpacer" />
+      <TextView
+        android:id="@+id/stats_longitude_value"
+        style="@style/StatsValue" />
+    </TableRow>
+  </TableLayout>
+</ScrollView>

MyTracks/res/layout/stats_core.xml

@@ -0,0 +1,116 @@
+<?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" >
+  <!-- Total distance -->
+  <TableRow>
+    <TextView
+      android:text="@string/stats_total_distance"
+      style="@style/StatsLabel" />
+  </TableRow>
+  <TableRow>
+    <TextView
+      android:id="@+id/stats_total_distance_value"
+      style="@style/StatsValue" />
+  </TableRow>
+  <!-- Total time/moving time -->
+  <TableRow>
+    <TextView
+      android:id="@+id/stats_total_time_label"
+      style="@style/StatsLabel" />
+  </TableRow>
+  <TableRow>
+    <TextView
+      android:id="@+id/stats_total_time_value"
+      style="@style/StatsValue" />
+  </TableRow>
+  <!-- Average speed/average moving speed and max speed (average pace/average moving pace and fastest pace) -->
+  <TableRow>
+    <TextView
+      android:id="@+id/stats_average_speed_label"
+      style="@style/StatsLabel" />
+    <TextView
+      android:id="@+id/stats_max_speed_label"
+      android:layout_column="2"
+      style="@style/StatsLabel" />
+  </TableRow>
+  <TableRow>
+    <TextView
+      android:id="@+id/stats_average_speed_value"
+      style="@style/StatsValue" />
+    <TextView style="@style/StatsSpacer" />
+    <TextView
+      android:id="@+id/stats_max_speed_value"
+      style="@style/StatsValue" />
+  </TableRow>
+  <!-- Elevation and elevation gain -->
+  <TableRow android:id="@+id/stats_elevation_label_table_row1" >
+    <TextView
+      android:text="@string/stats_elevation"
+      style="@style/StatsLabel" />
+    <TextView
+      android:layout_column="2"
+      android:text="@string/stats_elevation_gain"
+      style="@style/StatsLabel" />
+  </TableRow>
+  <TableRow android:id="@+id/stats_elevation_value_table_row1" >
+    <TextView
+      android:id="@+id/stats_elevation_value"
+      style="@style/StatsValue" />
+    <TextView style="@style/StatsSpacer" />
+    <TextView
+      android:id="@+id/stats_elevation_gain_value"
+      style="@style/StatsValue" />
+  </TableRow>
+  <!-- Min and max elevation -->
+  <TableRow android:id="@+id/stats_elevation_label_table_row2" >
+    <TextView
+      android:text="@string/stats_min_elevation"
+      style="@style/StatsLabel" />
+    <TextView
+      android:layout_column="2"
+      android:text="@string/stats_max_elevation"
+      style="@style/StatsLabel" />
+  </TableRow>
+  <TableRow android:id="@+id/stats_elevation_value_table_row2" >
+    <TextView
+      android:id="@+id/stats_min_elevation_value"
+      style="@style/StatsValue" />
+    <TextView style="@style/StatsSpacer" />
+    <TextView
+      android:id="@+id/stats_max_elevation_value"
+      style="@style/StatsValue" />
+  </TableRow>
+  <!-- Min and max grade -->
+  <TableRow android:id="@+id/stats_grade_label_table_row" >
+    <TextView
+      android:text="@string/stats_min_grade"
+      style="@style/StatsLabel" />
+    <TextView
+      android:layout_column="2"
+      android:text="@string/stats_max_grade"
+      style="@style/StatsLabel" />
+  </TableRow>
+  <TableRow android:id="@+id/stats_grade_value_table_row" >
+    <TextView
+      android:id="@+id/stats_min_grade_value"
+      style="@style/StatsValue" />
+    <TextView style="@style/StatsSpacer" />
+    <TextView
+      android:id="@+id/stats_max_grade_value"
+      style="@style/StatsValue" />
+  </TableRow>
+</merge>

MyTracks/res/layout/stats_settings.xml

@@ -0,0 +1,56 @@
+<?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" >
+  <LinearLayout
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:orientation="vertical"
+    android:padding="8dp" >
+    <TextView
+      android:text="@string/stats_settings_time"
+      style="@style/TextLarge" />
+    <RadioGroup
+      android:id="@+id/stats_settings_time"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content" >
+      <RadioButton
+        android:id="@+id/stats_settings_total_time"
+        android:text="@string/stats_total_time"
+        style="@style/TextMedium" />
+      <RadioButton
+        android:id="@+id/stats_settings_moving_time"
+        android:text="@string/stats_moving_time"
+        style="@style/TextMedium" />
+    </RadioGroup>
+    <TextView
+      android:text="@string/stats_settings_show"
+      style="@style/TextLarge" />
+    <CheckBox
+      android:id="@+id/stats_settings_elevation"
+      android:text="@string/stats_elevation"
+      style="@style/TextMedium" />
+    <CheckBox
+      android:id="@+id/stats_settings_grade"
+      android:text="@string/stats_settings_grade"
+      style="@style/TextMedium" />
+    <CheckBox
+      android:id="@+id/stats_settings_coordinate"
+      android:text="@string/stats_settings_coordinate"
+      style="@style/TextMedium" />
+  </LinearLayout>
+</ScrollView>

MyTracks/res/layout/track_detail.xml

@@ -16,17 +16,17 @@ limitations under the License.
 -->
 <TabHost xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@android:id/tabhost"
-  android:layout_height="match_parent"
+  android:layout_height="fill_parent"
-  android:layout_width="match_parent" >
+  android:layout_width="fill_parent" >
   <LinearLayout
-    android:layout_height="match_parent"
+    android:layout_height="fill_parent"
-    android:layout_width="match_parent"
+    android:layout_width="fill_parent"
     android:orientation="vertical" >
     <TabWidget
       android:id="@android:id/tabs"
       android:layout_height="wrap_content"
       android:layout_weight="0"
-      android:layout_width="match_parent"
+      android:layout_width="fill_parent"
       android:orientation="horizontal" />
     <FrameLayout
       android:id="@android:id/tabcontent"
@@ -37,6 +37,6 @@ limitations under the License.
       android:id="@+id/realtabcontent"
       android:layout_height="0dp"
       android:layout_weight="1"
-      android:layout_width="match_parent" />
+      android:layout_width="fill_parent" />
   </LinearLayout>
 </TabHost>

MyTracks/res/layout/track_edit.xml

@@ -18,10 +18,7 @@ limitations under the License.
   android:layout_height="fill_parent"
   android:layout_width="fill_parent"
   android:orientation="vertical" >
-  <ScrollView
+  <ScrollView style="@style/ScrollView.WithBottomButtons" >
-    android:layout_height="0dp"
-    android:layout_weight="1"
-    android:layout_width="fill_parent" >
     <LinearLayout
       android:layout_height="wrap_content"
       android:layout_width="fill_parent"
@@ -38,7 +35,7 @@ limitations under the License.
         style="@style/EditName" />
       <TextView
         android:text="@string/track_edit_activity_type"
-        style="@style/EditLabel" />
+        style="@style/EditLabel.WithPaddingTop" />
       <AutoCompleteTextView
         android:hint="@string/track_edit_activity_type_hint"
         android:id="@+id/track_edit_activity_type"
@@ -46,7 +43,7 @@ limitations under the License.
         style="@style/EditCategory" />
       <TextView
         android:text="@string/generic_description"
-        style="@style/EditLabel" />
+        style="@style/EditLabel.WithPaddingTop" />
       <EditText
         android:hint="@string/generic_description"
         android:id="@+id/track_edit_description"

MyTracks/res/layout/track_list.xml

@@ -14,7 +14,7 @@ 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"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_height="fill_parent"
   android:layout_width="fill_parent" >
   <ListView
@@ -26,15 +26,12 @@ limitations under the License.
     android:id="@+id/track_list_empty"
     android:layout_height="fill_parent"
     android:layout_width="fill_parent"
-    android:orientation="vertical"
+    android:orientation="vertical" >
-    android:padding="8dp" >
     <TextView
-      android:gravity="center"
+      android:id="@+id/track_list_empty_message"
-      android:layout_height="wrap_content"
-      android:layout_width="wrap_content"
-      android:paddingBottom="8dp"
       android:text="@string/track_list_empty_message"
-      style="@android:style/TextAppearance.DeviceDefault.Large" >
+      android:visibility="gone"
+      style="@style/ListEmptyTextView" >
     </TextView>
     <ImageButton
       android:contentDescription="@string/menu_record_track"
@@ -43,6 +40,7 @@ limitations under the License.
       android:layout_width="wrap_content"
       android:padding="16dp"
       android:src="@drawable/menu_record_track"
+      android:visibility="gone"
       style="@android:style/Widget.DeviceDefault.ImageButton" />
   </LinearLayout>
-</FrameLayout>
+</merge>

MyTracks/res/layout/track_widget.xml

@@ -14,77 +14,71 @@ 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"
-<LinearLayout
+  android:background="@drawable/app_widget_background"
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="fill_parent"
   android:layout_height="fill_parent"
+  android:layout_width="fill_parent"
+  android:paddingBottom="5dp"
   android:paddingLeft="10dp"
   android:paddingRight="10dp"
-  android:paddingTop="5dp"
+  android:paddingTop="5dp" >
-  android:paddingBottom="5dp">
+  <ImageButton
-  <LinearLayout
+    android:background="@android:color/transparent"
+    android:contentDescription="@string/my_tracks_app_name"
+    android:id="@+id/appwidget_button"
     android:layout_height="fill_parent"
-    android:layout_width="fill_parent"
+    android:layout_width="wrap_content"
-    android:background="@drawable/appwidget_background">
+    android:paddingLeft="10dp"
-    <ImageButton
+    android:paddingRight="10dp"
-      android:id="@+id/appwidget_button"
+    android:src="@drawable/app_widget_button_disabled" />
-      android:layout_height="fill_parent"
+  <LinearLayout
-      android:layout_width="wrap_content"
+    android:clickable="true"
-      android:background="@android:color/transparent"
+    android:id="@+id/appwidget_track_statistics"
-      android:paddingLeft="10dp"
+    android:layout_height="fill_parent"
-      android:paddingRight="10dp"
+    android:layout_weight="1"
-      android:src="@drawable/appwidget_button_disabled" />
+    android:layout_width="0dp"
+    android:orientation="vertical"
+    android:paddingLeft="16dp" >
     <LinearLayout
-      android:id="@+id/appwidget_track_statistics"
+      android:layout_height="wrap_content"
-      android:layout_height="fill_parent"
+      android:layout_width="fill_parent"
-      android:layout_width="0dp"
+      android:orientation="horizontal" >
-      android:layout_weight="1"
+      <TextView
-      android:clickable="true"
+        android:id="@+id/appwidget_distance_text"
-      android:orientation="vertical"
+        style="@style/TrackWidgetValue" />
-      android:paddingLeft="15dp">
+      <TextView
-      <LinearLayout
+        android:text="@string/stats_total_distance"
-        android:layout_height="wrap_content"
+        style="@style/TextSmall" />
-        android:layout_width="fill_parent"
+    </LinearLayout>
-        android:orientation="horizontal">
+    <LinearLayout
-        <TextView
+      android:background="@color/appwidget_hr"
-          style="@style/WidgetTextView.Value"
+      android:layout_height="1dp"
-          android:id="@+id/appwidget_distance_text" />
+      android:layout_width="fill_parent" />
-        <TextView
+    <LinearLayout
-          style="@style/WidgetTextView"
+      android:layout_height="wrap_content"
-          android:text="@string/stat_total_distance" />
+      android:layout_width="fill_parent"
-      </LinearLayout>
+      android:orientation="horizontal" >
-      <LinearLayout
+      <TextView
-        android:layout_width="fill_parent"
+        android:id="@+id/appwidget_time_text"
-        android:layout_height="1dp"
+        style="@style/TrackWidgetValue" />
-        android:background="@color/appwidget_hr" />
+      <TextView
-      <LinearLayout
+        android:text="@string/stats_moving_time"
-        android:layout_height="wrap_content"
+        style="@style/TextSmall" />
-        android:layout_width="fill_parent"
+    </LinearLayout>
-        android:orientation="horizontal"
+    <LinearLayout
-        android:paddingBottom="2dp">
+      android:background="@color/appwidget_hr"
-        <TextView
+      android:layout_height="1dp"
-          style="@style/WidgetTextView.Value"
+      android:layout_width="fill_parent" />
-          android:id="@+id/appwidget_time_text" />
+    <LinearLayout
-        <TextView
+      android:layout_height="wrap_content"
-          style="@style/WidgetTextView"
+      android:layout_width="fill_parent"
-          android:text="@string/stat_moving_time" />
+      android:orientation="horizontal" >
-      </LinearLayout>
+      <TextView
-      <LinearLayout
+        android:id="@+id/appwidget_speed_text"
-        android:layout_width="fill_parent"
+        style="@style/TrackWidgetValue" />
-        android:layout_height="1dp"
+      <TextView
-        android:background="@color/appwidget_hr" />
+        android:text="@string/stats_speed"
-      <LinearLayout
+        style="@style/TextSmall" />
-        android:layout_height="wrap_content"
-        android:layout_width="fill_parent"
-        android:orientation="horizontal">
-        <TextView
-          style="@style/WidgetTextView.Value"
-          android:id="@+id/appwidget_speed_text" />
-        <TextView
-          style="@style/WidgetTextView"
-          android:text="@string/stat_speed" />
-      </LinearLayout>
     </LinearLayout>
   </LinearLayout>
 </LinearLayout>

MyTracks/res/layout/upload_result.xml

@@ -15,13 +15,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_height="fill_parent"
+  style="@style/ScrollView" >
-  android:layout_margin="8dp"
-  android:layout_width="fill_parent" >
   <LinearLayout
     android:layout_height="wrap_content"
     android:layout_width="fill_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical"
+    android:padding="8dp" >
     <!-- Google Maps result -->
     <LinearLayout
       android:id="@+id/upload_result_maps_result"
@@ -36,20 +35,17 @@ limitations under the License.
         android:layout_width="wrap_content"
         android:src="@drawable/success" />
       <LinearLayout
+        android:layout_gravity="center_vertical"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:orientation="vertical"
         android:paddingLeft="8dp" >
         <TextView
-          android:layout_height="wrap_content"
-          android:layout_width="wrap_content"
           android:text="@string/send_google_maps"
-          style="@android:style/TextAppearance.DeviceDefault.Medium" />
+          style="@style/TextMedium" />
         <TextView
-          android:layout_height="wrap_content"
-          android:layout_width="wrap_content"
           android:text="@string/send_google_maps_url"
-          style="@android:style/TextAppearance.DeviceDefault.Small" />
+          style="@style/TextSmall" />
       </LinearLayout>
     </LinearLayout>
     <!-- Google Fusion Tables result -->
@@ -66,20 +62,17 @@ limitations under the License.
         android:layout_width="wrap_content"
         android:src="@drawable/success" />
       <LinearLayout
+        android:layout_gravity="center_vertical"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:orientation="vertical"
         android:paddingLeft="8dp" >
         <TextView
-          android:layout_height="wrap_content"
-          android:layout_width="wrap_content"
           android:text="@string/send_google_fusion_tables"
-          style="@android:style/TextAppearance.DeviceDefault.Medium" />
+          style="@style/TextMedium" />
         <TextView
-          android:layout_height="wrap_content"
-          android:layout_width="wrap_content"
           android:text="@string/send_google_fusion_tables_url"
-          style="@android:style/TextAppearance.DeviceDefault.Small" />
+          style="@style/TextSmall" />
       </LinearLayout>
     </LinearLayout>
     <!-- Google Docs result -->
@@ -96,36 +89,29 @@ limitations under the License.
         android:layout_width="wrap_content"
         android:src="@drawable/success" />
       <LinearLayout
+        android:layout_gravity="center_vertical"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:orientation="vertical"
         android:paddingLeft="8dp" >
         <TextView
-          android:layout_height="wrap_content"
-          android:layout_width="wrap_content"
           android:text="@string/send_google_docs"
-          style="@android:style/TextAppearance.DeviceDefault.Medium" />
+          style="@style/TextMedium" />
         <TextView
-          android:layout_height="wrap_content"
-          android:layout_width="wrap_content"
           android:text="@string/send_google_docs_url"
-          style="@android:style/TextAppearance.DeviceDefault.Small" />
+          style="@style/TextSmall" />
       </LinearLayout>
     </LinearLayout>
     <!-- Footer -->
     <TextView
       android:id="@+id/upload_result_success_footer"
-      android:layout_height="wrap_content"
-      android:layout_width="wrap_content"
       android:padding="8dp"
       android:text="@string/send_google_success_footer"
-      style="@android:style/TextAppearance.DeviceDefault.Small" />
+      style="@style/TextSmall" />
     <TextView
       android:id="@+id/upload_result_error_footer"
-      android:layout_height="wrap_content"
-      android:layout_width="wrap_content"
       android:padding="8dp"
       android:text="@string/send_google_error"
-      style="@android:style/TextAppearance.DeviceDefault.Medium" />
+      style="@style/TextMedium" />
   </LinearLayout>
 </ScrollView>