Add activity icon next to calorie in stats page

MyTracks/res/layout-land/stats_content.xml

@@ -24,7 +24,7 @@ limitations under the License.
       layout="@layout/stats_large_item" />
     <include
       android:id="@+id/stats_calorie"
-      layout="@layout/stats_large_item" />
+      layout="@layout/stats_calorie" />
     <View
       android:layout_height="match_parent"
       android:layout_width="1dp"

MyTracks/res/layout/stats_calorie.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2013 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"
+  style="@style/StatsLargeItemContainer" >
+  <!-- Label -->
+  <TextView
+    android:id="@+id/stats_label"
+    style="@style/StatsLargeLabel" />
+  <!-- Value container -->
+  <LinearLayout style="@style/StatsLargeValueContainer" >
+    <!-- Value -->
+    <TextView
+      android:id="@+id/stats_value"
+      style="@style/StatsLargeValue" />
+    <!-- Unit -->
+    <TextView
+      android:id="@+id/stats_unit"
+      style="@style/StatsUnit" />
+    <!-- Activity type -->
+    <Spinner
+      android:id="@+id/stats_activity_type_icon"
+      android:layout_height="wrap_content"
+      android:layout_marginLeft="4dp"
+      android:layout_marginTop="-6dp"
+      android:layout_width="wrap_content" />
+  </LinearLayout>
+</LinearLayout>

MyTracks/res/layout/stats_content.xml

@@ -24,7 +24,7 @@ limitations under the License.
       layout="@layout/stats_large_item" />
     <include
       android:id="@+id/stats_calorie"
-      layout="@layout/stats_large_item" />
+      layout="@layout/stats_calorie" />
   </LinearLayout>
   <!-- Total time and moving time -->
   <LinearLayout

MyTracks/res/layout/stats_large_item.xml

@@ -15,17 +15,18 @@ 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:id="@+id/stats_large_item_id"
   style="@style/StatsLargeItemContainer" >
-  <!-- Distance label -->
+  <!-- Label -->
   <TextView
     android:id="@+id/stats_label"
     style="@style/StatsLargeLabel" />
-  <!-- Distance value -->
+  <!-- Value container -->
   <LinearLayout style="@style/StatsLargeValueContainer" >
+    <!-- Value -->
     <TextView
       android:id="@+id/stats_value"
       style="@style/StatsLargeValue" />
+    <!-- Unit -->
     <TextView
       android:id="@+id/stats_unit"
       style="@style/StatsUnit" />

MyTracks/res/layout/stats_small_group_item.xml

@@ -17,22 +17,24 @@ limitations under the License.
 <TableRow xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_height="wrap_content"
   android:layout_width="wrap_content" >
-  <RelativeLayout
+  <!-- Value container -->
+  <LinearLayout
     android:layout_gravity="right|bottom"
     style="@style/StatsSmallValueContainer" >
+    <!-- Value -->
     <TextView
       android:id="@+id/stats_value"
-      android:layout_alignParentBottom="true"
       style="@style/StatsSmallValue" />
+    <!-- Unit -->
     <TextView
       android:id="@+id/stats_unit"
-      android:layout_alignParentBottom="true"
-      android:layout_toRightOf="@id/stats_value"
       style="@style/StatsUnit" />
-  </RelativeLayout>
+  </LinearLayout>
+  <!-- Label container -->
   <LinearLayout
     android:layout_gravity="left|bottom"
     style="@style/StatsSmallValueContainer" >
+    <!-- Label -->
     <TextView
       android:id="@+id/stats_label"
       android:paddingLeft="8dp"

MyTracks/res/layout/stats_small_item.xml

@@ -15,16 +15,18 @@ 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:id="@+id/stats_small_item_id"
   style="@style/StatsSmallItemContainer" >
+  <!-- Label -->
   <TextView
     android:id="@+id/stats_label"
     style="@style/StatsSmallLabel" />
-  <!-- Distance value -->
+  <!-- Value container -->
   <LinearLayout style="@style/StatsSmallValueContainer" >
+    <!-- Value -->
     <TextView
       android:id="@+id/stats_value"
       style="@style/StatsSmallValue" />
+    <!-- Unit -->
     <TextView
       android:id="@+id/stats_unit"
       style="@style/StatsUnit" />

MyTracks/res/values/strings.xml

@@ -2157,11 +2157,11 @@ limitations under the License.
       Character limit: ~23 (1 line)">
     Calories
   </string>
-  <string name="stats_calorie_setup"
-    translation_description="In the 'Stats' page, the button to setup calorie.
+  <string name="stats_calorie_no_calculation"
+    translation_description="In the 'Stats' page, the message when calories cannot be calculated.
 
-      Character limit: ~23 (1 line)">
-    Setup Activity Type
+      %1$s activity type. E.g., 'driving'.">
+    Calories can\'t be calculated with %1$s.
   </string>
   <string name="stats_fastest_pace"
     translation_description="In the 'Stats' page, the fastest pace.">