From dfa60a44f62ebdd678598bd5c3779e2ff98e8d36 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Tue, 7 May 2013 09:51:00 -0700
Subject: [PATCH] Update stats view layout

---
 MyTracks/res/layout/marker_detail.xml         |  11 +-
 MyTracks/res/layout/stats.xml                 |  43 +-
 MyTracks/res/layout/stats_content.xml         | 132 ++++++
 MyTracks/res/layout/stats_core.xml            | 140 -------
 MyTracks/res/layout/stats_large_item.xml      |  33 ++
 MyTracks/res/layout/stats_small_item.xml      |  32 ++
 ...d_stats.xml => stats_small_item_1line.xml} |  28 +-
 MyTracks/res/values-v11/styles.xml            |   2 +-
 MyTracks/res/values-v14/styles.xml            |  17 +
 MyTracks/res/values/keys.xml                  |   4 +-
 MyTracks/res/values/strings.xml               |  72 +---
 MyTracks/res/values/styles.xml                |  90 +++-
 MyTracks/res/xml/stats_settings.xml           |  12 +-
 .../mytracks/AggregatedStatsActivity.java     |   2 +-
 .../mytracks/fragments/StatsFragment.java     |   9 +-
 .../apps/mytracks/util/PreferencesUtils.java  |   4 +-
 .../apps/mytracks/util/StatsUtils.java        | 386 ++++++++----------
 .../apps/mytracks/util/StringUtils.java       |  34 --
 .../apps/mytracks/util/StringUtilsTest.java   |  22 -
 .../mytracks/endtoendtest/SettingTest.java    |   3 +-
 20 files changed, 521 insertions(+), 555 deletions(-)
 create mode 100644 MyTracks/res/layout/stats_content.xml
 delete mode 100644 MyTracks/res/layout/stats_core.xml
 create mode 100644 MyTracks/res/layout/stats_large_item.xml
 create mode 100644 MyTracks/res/layout/stats_small_item.xml
 rename MyTracks/res/layout/{aggregated_stats.xml => stats_small_item_1line.xml} (52%)

diff --git a/MyTracks/res/layout/marker_detail.xml b/MyTracks/res/layout/marker_detail.xml
index 70f303bd5..166b426d3 100644
--- a/MyTracks/res/layout/marker_detail.xml
+++ b/MyTracks/res/layout/marker_detail.xml
@@ -15,7 +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"
-  style="@style/ScrollView" >
+  style="@style/StatsScrollView" >
   <LinearLayout
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
@@ -44,14 +44,7 @@ limitations under the License.
       <TextView
         android:text="@string/marker_detail_statistics_title"
         style="@style/TextLarge.WithTopMargin" />
-      <TableLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:paddingTop="8dp"
-        android:shrinkColumns="0,2"
-        android:stretchColumns="0,2" >
-        <include layout="@layout/stats_core" />
-      </TableLayout>
+      <include layout="@layout/stats_content" />
     </LinearLayout>
   </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/MyTracks/res/layout/stats.xml b/MyTracks/res/layout/stats.xml
index 82ce3bf09..d3edb9d15 100644
--- a/MyTracks/res/layout/stats.xml
+++ b/MyTracks/res/layout/stats.xml
@@ -15,42 +15,13 @@ 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" >
-  <TableLayout
+  style="@style/StatsScrollView" >
+  <LinearLayout
     android:layout_height="wrap_content"
     android:layout_width="match_parent"
-    android:padding="8dp"
-    android:shrinkColumns="0,2"
-    android:stretchColumns="0,2" >
-    <!-- Speed on one line -->
-    <TableRow>
-      <TextView
-        android:id="@+id/stats_speed_label"
-        style="@style/StatsLabel" />
-    </TableRow>
-    <TableRow>
-      <TextView
-        android:id="@+id/stats_speed_value"
-        style="@style/StatsValue" />
-    </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>
+    android:orientation="vertical"
+    android:paddingLeft="8dp"
+    android:paddingRight="8dp" >
+    <include layout="@layout/stats_content" />
+  </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/MyTracks/res/layout/stats_content.xml b/MyTracks/res/layout/stats_content.xml
new file mode 100644
index 000000000..99ab08836
--- /dev/null
+++ b/MyTracks/res/layout/stats_content.xml
@@ -0,0 +1,132 @@
+<?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.
+-->
+<merge xmlns:android="http://schemas.android.com/apk/res/android" >
+  <!-- Row 1: distance and speed -->
+  <LinearLayout
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent" >
+    <include
+      android:id="@+id/stats_distance"
+      layout="@layout/stats_large_item" />
+    <View style="@style/StatsVerticalSpacer" />
+    <include
+      android:id="@+id/stats_speed"
+      layout="@layout/stats_large_item" />
+  </LinearLayout>
+  <!-- Row 2: total time and average speed -->
+  <LinearLayout
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent" >
+    <include
+      android:id="@+id/stats_total_time"
+      layout="@layout/stats_large_item" />
+    <View style="@style/StatsVerticalSpacer" />
+    <include
+      android:id="@+id/stats_average_speed"
+      layout="@layout/stats_large_item" />
+  </LinearLayout>
+  <!-- Row 3: horizontal line -->
+  <View style="@style/StatsHorizontalLine" />
+  <!-- Row 3: moving time and average moving speed -->
+  <LinearLayout
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent" >
+    <include
+      android:id="@+id/stats_moving_time"
+      layout="@layout/stats_small_item" />
+    <View style="@style/StatsVerticalSpacer" />
+    <include
+      android:id="@+id/stats_average_moving_time"
+      layout="@layout/stats_small_item" />
+  </LinearLayout>
+  <!-- Row 4: empty and max speed -->
+  <LinearLayout
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent" >
+    <LinearLayout style="@style/StatsSmallItemContainer" />
+    <View style="@style/StatsVerticalSpacer" />
+    <include
+      android:id="@+id/stats_max_speed"
+      layout="@layout/stats_small_item" />
+  </LinearLayout>
+  <!-- Row 5: horizontal line -->
+  <View
+    android:id="@+id/stats_grade_elevation_horizontal_line"
+    style="@style/StatsHorizontalLine" />
+  <!-- Row 5: grade and elevation -->
+  <LinearLayout
+    android:id="@+id/stats_grade_elevation_container"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent" >
+    <!-- Grade -->
+    <LinearLayout style="@style/StatsSmallItemContainer" >
+      <!-- Grade label -->
+      <TextView
+        android:text="@string/stats_grade"
+        style="@style/StatsSmallLabel" />
+      <!-- Grade min -->
+      <include
+        android:id="@+id/stats_grade_min"
+        layout="@layout/stats_small_item_1line" />
+      <!-- Grade max -->
+      <include
+        android:id="@+id/stats_grade_max"
+        layout="@layout/stats_small_item_1line" />
+    </LinearLayout>
+    <View style="@style/StatsVerticalSpacer" />
+    <!-- Elevation -->
+    <LinearLayout style="@style/StatsSmallItemContainer" >
+      <!-- Elevation label -->
+      <TextView
+        android:text="@string/stats_elevation"
+        style="@style/StatsSmallLabel" />
+      <!-- Elevation -->
+      <include
+        android:id="@+id/stats_elevation"
+        layout="@layout/stats_small_item_1line" />
+      <!-- Elevation gain -->
+      <include
+        android:id="@+id/stats_elevation_gain"
+        layout="@layout/stats_small_item_1line" />
+      <!-- Elevation min -->
+      <include
+        android:id="@+id/stats_elevation_min"
+        layout="@layout/stats_small_item_1line" />
+      <!-- Elevation max -->
+      <include
+        android:id="@+id/stats_elevation_max"
+        layout="@layout/stats_small_item_1line" />
+    </LinearLayout>
+  </LinearLayout>
+  <!-- Row 6: horizontal line -->
+  <View
+    android:id="@+id/stats_coordinate_horizontal_line"
+    style="@style/StatsHorizontalLine" />
+  <!-- Row 6: latitude and longitude -->
+  <LinearLayout
+    android:id="@+id/stats_coordinate_container"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent" >
+    <include
+      android:id="@+id/stats_latitude"
+      layout="@layout/stats_small_item" />
+    <View style="@style/StatsVerticalSpacer" />
+    <include
+      android:id="@+id/stats_longitude"
+      layout="@layout/stats_small_item" />
+  </LinearLayout>
+</merge>
\ No newline at end of file
diff --git a/MyTracks/res/layout/stats_core.xml b/MyTracks/res/layout/stats_core.xml
deleted file mode 100644
index e7d3301e1..000000000
--- a/MyTracks/res/layout/stats_core.xml
+++ /dev/null
@@ -1,140 +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" >
-  <!-- Total distance -->
-  <TableRow>
-    <TextView
-      android:text="@string/stats_distance"
-      style="@style/StatsLabel" />
-  </TableRow>
-  <TableRow>
-    <TextView
-      android:id="@+id/stats_distance_value"
-      style="@style/StatsValue" />
-  </TableRow>
-  <!-- Total time/moving time -->
-  <TableRow>
-    <TextView
-      android:text="@string/stats_total_time"
-      style="@style/StatsLabel" />
-    <TextView
-      android:id="@+id/stats_moving_time_label"
-      android:layout_column="2"
-      android:text="@string/stats_moving_time"
-      style="@style/StatsLabel" />
-  </TableRow>
-  <TableRow>
-    <TextView
-      android:id="@+id/stats_total_time_value"
-      style="@style/StatsValue" />
-    <TextView 
-      android:id="@+id/stats_moving_time_spacer"
-      style="@style/StatsSpacer" />
-    <TextView
-      android:id="@+id/stats_moving_time_value"
-      style="@style/StatsValue" />
-  </TableRow>
-  <!-- Average speed/average moving speed (average pace/average moving pace) -->
-  <TableRow>
-    <TextView
-      android:id="@+id/stats_average_speed_label"
-      style="@style/StatsLabel" />
-    <TextView
-      android:id="@+id/stats_average_moving_speed_label"
-      android:layout_column="2"
-      style="@style/StatsLabel" />
-  </TableRow>
-  <TableRow>
-    <TextView
-      android:id="@+id/stats_average_speed_value"
-      style="@style/StatsValue" />
-    <TextView 
-      android:id="@+id/stats_average_moving_speed_spacer"
-      style="@style/StatsSpacer" />
-    <TextView
-      android:id="@+id/stats_average_moving_speed_value"
-      style="@style/StatsValue" />
-  </TableRow>
-  <!-- Max speed (fastest pace) -->
-  <TableRow>
-    <TextView
-      android:id="@+id/stats_max_speed_label"
-      style="@style/StatsLabel" />
-  </TableRow>
-  <TableRow>
-    <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>
\ No newline at end of file
diff --git a/MyTracks/res/layout/stats_large_item.xml b/MyTracks/res/layout/stats_large_item.xml
new file mode 100644
index 000000000..d841b91cb
--- /dev/null
+++ b/MyTracks/res/layout/stats_large_item.xml
@@ -0,0 +1,33 @@
+<?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"
+  android:id="@+id/stats_large_item_id"
+  style="@style/StatsLargeItemContainer" >
+  <!-- Distance label -->
+  <TextView
+    android:id="@+id/stats_label"
+    style="@style/StatsLargeLabel" />
+  <!-- Distance value -->
+  <LinearLayout style="@style/StatsLargeValueContainer" >
+    <TextView
+      android:id="@+id/stats_value"
+      style="@style/StatsLargeValue" />
+    <TextView
+      android:id="@+id/stats_unit"
+      style="@style/StatsUnit" />
+  </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/MyTracks/res/layout/stats_small_item.xml b/MyTracks/res/layout/stats_small_item.xml
new file mode 100644
index 000000000..0e2e817b5
--- /dev/null
+++ b/MyTracks/res/layout/stats_small_item.xml
@@ -0,0 +1,32 @@
+<?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"
+  android:id="@+id/stats_small_item_id"
+  style="@style/StatsSmallItemContainer" >
+  <TextView
+    android:id="@+id/stats_label"
+    style="@style/StatsSmallLabel" />
+  <!-- Distance value -->
+  <LinearLayout style="@style/StatsSmallValueContainer" >
+    <TextView
+      android:id="@+id/stats_value"
+      style="@style/StatsSmallValue" />
+    <TextView
+      android:id="@+id/stats_unit"
+      style="@style/StatsUnit" />
+  </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/MyTracks/res/layout/aggregated_stats.xml b/MyTracks/res/layout/stats_small_item_1line.xml
similarity index 52%
rename from MyTracks/res/layout/aggregated_stats.xml
rename to MyTracks/res/layout/stats_small_item_1line.xml
index b32fc1498..81c960fc2 100644
--- a/MyTracks/res/layout/aggregated_stats.xml
+++ b/MyTracks/res/layout/stats_small_item_1line.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright 2012 Google Inc.
+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.
@@ -14,14 +14,18 @@ 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">
-  <TableLayout
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    android:padding="8dp"
-    android:shrinkColumns="0,2"
-    android:stretchColumns="0,2" >
-    <include layout="@layout/stats_core" />
-  </TableLayout>
-</ScrollView>
\ No newline at end of file
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/stats_small_1line_id"
+  style="@style/StatsSmallValueContainer" >
+  <TextView
+    android:id="@+id/stats_value"
+    style="@style/StatsSmallValue" />
+  <TextView
+    android:id="@+id/stats_unit"
+    style="@style/StatsUnit" />
+  <TextView
+    android:id="@+id/stats_label"
+    android:layout_gravity="bottom"
+    android:paddingLeft="8dp"
+    style="@style/StatsSmallLabel" />
+</LinearLayout>
\ No newline at end of file
diff --git a/MyTracks/res/values-v11/styles.xml b/MyTracks/res/values-v11/styles.xml
index 8cd65b2bb..ee9643069 100644
--- a/MyTracks/res/values-v11/styles.xml
+++ b/MyTracks/res/values-v11/styles.xml
@@ -31,7 +31,7 @@ limitations under the License.
   </style>
   <style name="ListItem">
     <item name="android:background">?android:attr/activatedBackgroundIndicator</item>
-  </style>  
+  </style>
   <style name="MyTracksActionBar" parent="@android:style/Widget.Holo.ActionBar">
     <!-- Same image as the source except using a grey line instead of a blue line -->
     <item name="android:background">@drawable/ab_transparent_dark_holo</item>
diff --git a/MyTracks/res/values-v14/styles.xml b/MyTracks/res/values-v14/styles.xml
index c38259526..c449821a0 100644
--- a/MyTracks/res/values-v14/styles.xml
+++ b/MyTracks/res/values-v14/styles.xml
@@ -30,6 +30,23 @@ limitations under the License.
     <item name="android:orientation">horizontal</item>
     <item name="android:measureWithLargestChild">true</item>
   </style>
+  <style name="StatsSmallLabel" parent="@style/TextSmall">
+    <!-- same as StatsSmallLabel in values/styles.xml except adding textAllCaps -->
+    <item name="android:gravity">right</item>
+    <item name="android:layout_gravity">right</item>
+    <item name="android:singleLine">false</item>
+    <item name="android:textAllCaps">true</item>
+    <item name="android:textStyle">bold</item>
+  </style>   
+  <style name="StatsLargeLabel" parent="@style/TextSmall">
+    <!-- same as StatsLargeLabel in values/styles.xml except adding textAllCaps -->
+    <item name="android:gravity">right</item>
+    <item name="android:layout_gravity">right</item>
+    <item name="android:singleLine">false</item>
+    <item name="android:textAllCaps">true</item>
+    <item name="android:textColor">@color/stats_large_label</item>
+    <item name="android:textStyle">bold</item>
+  </style>  
   <style name="TextChooseActivity"> 
     <!-- Same as TextChooseActivity in values/styles.xml except removing textSize and using textAppearance -->
     <item name="android:textAppearance">?android:attr/textAppearanceListItemSmall</item>
diff --git a/MyTracks/res/values/keys.xml b/MyTracks/res/values/keys.xml
index 0c61dd728..731da2ad3 100644
--- a/MyTracks/res/values/keys.xml
+++ b/MyTracks/res/values/keys.xml
@@ -53,9 +53,7 @@ limitations under the License.
   <string name="share_track_key">shareTrack</string>
   <string name="split_frequency_key">splitFrequency</string>
   <string name="stats_show_coordinate_key">statsShowCoordinate</string>
-  <string name="stats_show_elevation_key">statsShowElevation</string>
-  <string name="stats_show_grade_key">statsShowGrade</string>
-  <string name="stats_show_moving_time_key">statsShowMovingTime</string>
+  <string name="stats_show_grade_elevation_key">statsShowGradeElevation</string>
   <string name="track_color_mode_medium_key">trackColorModeMedium</string>
   <string name="track_color_mode_percentage_key">trackColorModePercentage</string>
   <string name="track_color_mode_slow_key">trackColorModeSlow</string>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 8cf9fd183..f55a9494b 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -2089,12 +2089,12 @@ limitations under the License.
       Character limit: ~23 (1 line)">
     Latitude/Longitude
   </string>
-  <string name="settings_stats_grade"
-    translation_description="In the 'Stats settings, the option to show grade. Grade is the amount
-      of inclination to the horizontal, also known as slope or incline.
+  <string name="settings_stats_grade_elevation"
+    translation_description="In the 'Stats settings, the option to show grade and elevation. Grade
+      is the amount of inclination to the horizontal, also known as slope or incline.
 
       Character limit: ~23 (1 line)">
-    Grade
+    Grade/Elevation
   </string>
   <string name="settings_stats_rate_title"
     translation_description="In the 'Stats' settings, the option to change the preferred rate,
@@ -2209,14 +2209,19 @@ limitations under the License.
       Character limit: ~23 (1 line)">
     Elevation
   </string>
-  <string name="stats_elevation_gain"
-    translation_description="In the 'Stats' page, the elevation gain.">
-    Elevation gain
-  </string>
   <string name="stats_fastest_pace"
     translation_description="In the 'Stats' page, the fastest pace.">
     Fastest pace
   </string>
+  <string name="stats_gain"
+    translation_description="In the 'Stats' page, the gain of a value. E.g, gain in elevation.">
+    Gain
+  </string>
+  <string name="stats_grade"
+    translation_description="In the 'Stats' page, the grade. Grade is the amount of inclination to
+      the horizontal, also known as slope or incline.">
+    Grade
+  </string>  
   <string name="stats_latitude"
     translation_description="In the 'Stats' page, the latitude.">
     Latitude
@@ -2225,25 +2230,17 @@ limitations under the License.
     translation_description="In the 'Stats' page, the longitude.">
     Longitude
   </string>
-  <string name="stats_max_elevation"
-    translation_description="In the 'Stats' page, the maximum elevation.">
-    Max elevation
-  </string>
-  <string name="stats_max_grade"
-    translation_description="In the 'Stats' page, the maximum grade.">
-    Max grade
+  <string name="stats_max"
+    translation_description="In the 'Stats' page, the maximum of a value.">
+    Max
   </string>
   <string name="stats_max_speed"
     translation_description="In the 'Stats' page, the maximum speed.">
     Max speed
   </string>
-  <string name="stats_min_elevation"
-    translation_description="In the 'Stats' page, the minimum elevation.">
-    Min elevation
-  </string>
-  <string name="stats_min_grade"
-    translation_description="In the 'Stats' page, the minimum grade.">
-    Min grade
+  <string name="stats_min"
+    translation_description="In the 'Stats' page, the minimum of a value.">
+    Min
   </string>
   <string name="stats_moving_time"
     translation_description="In the 'Stats' page, the moving time.">
@@ -2464,13 +2461,6 @@ limitations under the License.
     translation_description="In a setting picker, the value to always enable the option.">
     Always
   </string>
-  <string name="value_coordinate_degree"
-    translation_description="To display a latitude or longitude coordinate in degree. E.g.,
-      '2.2 \u00B0'. \u00B0 is the unicode value for the degree symbol.
-
-      %1$s: a string value of the coordinate. E.g., '2.2'.">
-    %1$s \u00B0
-  </string>
   <string name="value_float_feet"
     translation_description="Display a float value in feet (ft).
 
@@ -2483,12 +2473,6 @@ limitations under the License.
       %1$.2f: a float number. E.g., '2.22'.">
     %1$.2f km
   </string>
-  <string name="value_float_kilometer_hour"
-    translation_description="Display a float value in kilometers per hour (km/h).
-
-      %1$.2f: a float number. E.g., '2.22'.">
-    %1$.2f km/h
-  </string>
   <string name="value_float_meter"
     translation_description="Display a float value in meters (m).
 
@@ -2501,12 +2485,6 @@ limitations under the License.
       %1$.2f: a float number. E.g., '2.22'.">
     %1$.2f mi
   </string>
-  <string name="value_float_mile_hour"
-    translation_description="Display a float value in miles per hour (mi/h).
-
-      %1$.2f: a float number. E.g., '2.22'.">
-    %1$.2f mi/h
-  </string>
   <string name="value_float_mile_poor_gps"
     translation_description="In a setting picker, the string format to display a float value in
       miles (mi), recommended when having poor GPS signal.
@@ -2514,18 +2492,6 @@ limitations under the License.
       %1$.1f: a float number. E.g., '2.2'.">
     %1$.1f mi (poor GPS)
   </string>
-  <string name="value_float_minute_kilometer"
-    translation_description="Display a float value in minutes per kilometer (min/km).
-
-      %1$.2f: a float number. E.g., '2.22'.">
-    %1$.2f min/km
-  </string>
-  <string name="value_float_minute_mile"
-    translation_description="Display a float value in minutes per mile (min/mi).
-
-      %1$.2f: a float number. E.g., '2.22'.">
-    %1$.2f min/mi
-  </string>
   <string name="value_integer_feet"
     translation_description="In a setting picker, the string format to display an integer value in
       feet (ft).
diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml
index 0e179328d..9d6b7cc40 100644
--- a/MyTracks/res/values/styles.xml
+++ b/MyTracks/res/values/styles.xml
@@ -130,24 +130,82 @@ limitations under the License.
     <item name="android:paddingRight">8dp</item>
     <item name="android:textColor">@android:color/primary_text_light</item>
   </style>
-  <!-- stats label -->
-  <style name="StatsLabel" parent="@style/TextMedium">
-    <item name="android:layout_weight">1</item>
-    <item name="android:layout_width">0dp</item>
+  <!-- stats horizontal line -->
+  <style name="StatsHorizontalLine">
+    <item name="android:background">@color/stats_separator</item>
+    <item name="android:layout_height">1dp</item>
+    <item name="android:layout_width">match_parent</item>
   </style>
-  <!-- stats spacer -->
-  <style name="StatsSpacer">
-    <item name="android:layout_height">match_parent</item>
-    <item name="android:layout_width">8dp</item>
-  </style>
-  <!-- stats value -->
-  <style name="StatsValue" parent="@style/TextLarge">
-    <item name="android:background">@android:color/background_light</item>
-    <item name="android:gravity">right</item>
-    <item name="android:layout_weight">1</item>
+  <!-- stats large item container -->
+  <style name="StatsLargeItemContainer">
+    <item name="android:layout_gravity">top</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_weight">10</item>
     <item name="android:layout_width">0dp</item>
+    <item name="android:orientation">vertical</item>
+    <item name="android:paddingBottom">6dp</item>
+    <item name="android:paddingLeft">8dp</item>
     <item name="android:paddingRight">8dp</item>
-    <item name="android:textColor">@android:color/primary_text_light</item>
+    <item name="android:paddingTop">6dp</item>
+  </style>
+  <!-- stats large label -->
+  <style name="StatsLargeLabel" parent="@style/TextSmall">
+    <item name="android:gravity">right</item>
+    <item name="android:layout_gravity">right</item>
+    <item name="android:singleLine">false</item>
+    <item name="android:textColor">@color/stats_large_label</item>
+    <item name="android:textStyle">bold</item>
+  </style>
+  <!-- stats large value -->
+  <style name="StatsLargeValue">
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:singleLine">true</item>
+    <item name="android:textColor">@android:color/white</item>
+    <item name="android:textSize">32sp</item>
+    <item name="android:textStyle">bold</item>
+  </style>
+  <!-- stats large value container -->
+  <style name="StatsLargeValueContainer">
+    <item name="android:layout_gravity">right</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_marginTop">-4dp</item>
+    <item name="android:layout_width">wrap_content</item>
+  </style>
+  <!-- stats scroll view -->
+  <style name="StatsScrollView" parent="@style/ScrollView">
+    <item name="android:scrollbarStyle">outsideOverlay</item>
+  </style>  
+  <!-- stats small item container -->
+  <style name="StatsSmallItemContainer" parent="@style/StatsLargeItemContainer">
+    <item name="android:paddingTop">12dp</item>
+  </style>
+  <!-- stats small label -->
+  <style name="StatsSmallLabel" parent="@style/TextSmall">
+    <item name="android:gravity">right</item>
+    <item name="android:layout_gravity">right</item>
+    <item name="android:singleLine">false</item>
+    <item name="android:textStyle">bold</item>
+  </style>
+  <!-- stats small value -->
+  <style name="StatsSmallValue" parent="@style/TextLarge">
+    <item name="android:singleLine">true</item>
+    <item name="android:textColor">@android:color/white</item>
+  </style>
+  <!-- stats small value container -->
+  <style name="StatsSmallValueContainer" parent="@style/StatsLargeValueContainer">
+    <item name="android:layout_marginTop">-2dp</item>
+  </style>
+  <!-- stats unit -->
+  <style name="StatsUnit" parent="@style/TextSmall">
+    <item name="android:paddingLeft">4dp</item>
+    <item name="android:singleLine">true</item>
+  </style>
+  <!-- stats vertical spacer -->
+  <style name="StatsVerticalSpacer">
+    <item name="android:layout_height">match_parent</item>
+    <item name="android:layout_weight">1</item>
+    <item name="android:layout_width">0dp</item>
   </style>
   <!-- text choose activity -->
   <style name="TextChooseActivity">
@@ -342,7 +400,7 @@ limitations under the License.
     <item name="android:textSize">18dp</item>
   </style>
   <!-- track widget value -->
-  <style name="TrackWidgetValue">    
+  <style name="TrackWidgetValue">
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_weight">2</item>
     <item name="android:layout_width">0dp</item>
diff --git a/MyTracks/res/xml/stats_settings.xml b/MyTracks/res/xml/stats_settings.xml
index 6b0f4efd0..104963d49 100644
--- a/MyTracks/res/xml/stats_settings.xml
+++ b/MyTracks/res/xml/stats_settings.xml
@@ -29,16 +29,8 @@ limitations under the License.
   <PreferenceCategory android:title="@string/settings_show" >
     <CheckBoxPreference
       android:defaultValue="false"
-      android:key="@string/stats_show_moving_time_key"
-      android:title="@string/stats_moving_time" />
-    <CheckBoxPreference
-      android:defaultValue="false"
-      android:key="@string/stats_show_elevation_key"
-      android:title="@string/stats_elevation" />
-    <CheckBoxPreference
-      android:defaultValue="false"
-      android:key="@string/stats_show_grade_key"
-      android:title="@string/settings_stats_grade" />
+      android:key="@string/stats_show_grade_elevation_key"
+      android:title="@string/settings_stats_grade_elevation" />
     <CheckBoxPreference
       android:defaultValue="false"
       android:key="@string/stats_show_coordinate_key"
diff --git a/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java
index 6acb6eae3..e270e44b6 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/AggregatedStatsActivity.java
@@ -42,7 +42,7 @@ public class AggregatedStatsActivity extends AbstractMyTracksActivity {
 
   @Override
   protected int getLayoutResId() {
-    return R.layout.aggregated_stats;
+    return R.layout.stats;
   }
 
   /**
diff --git a/MyTracks/src/com/google/android/apps/mytracks/fragments/StatsFragment.java b/MyTracks/src/com/google/android/apps/mytracks/fragments/StatsFragment.java
index 0e97205dd..84742c25c 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/fragments/StatsFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/fragments/StatsFragment.java
@@ -102,7 +102,7 @@ public class StatsFragment extends Fragment implements TrackDataListener {
         public void run() {
           if (isResumed()) {
             lastLocation = null;
-            StatsUtils.setLocationValues(getActivity(), lastLocation, true);
+            StatsUtils.setLocationValues(getActivity(), lastLocation, isSelectedTrackRecording());
           }
         }
       });
@@ -118,11 +118,12 @@ public class StatsFragment extends Fragment implements TrackDataListener {
           if (isResumed()) {
             if (isSelectedTrackRecording() && !isSelectedTrackPaused()) {
               lastLocation = location;
-              StatsUtils.setLocationValues(getActivity(), location, true);
+              StatsUtils.setLocationValues(getActivity(), location, isSelectedTrackRecording());
             } else {
               if (lastLocation != null) {
                 lastLocation = null;
-                StatsUtils.setLocationValues(getActivity(), lastLocation, true);
+                StatsUtils.setLocationValues(
+                    getActivity(), lastLocation, isSelectedTrackRecording());
               }
             }
           }
@@ -277,6 +278,6 @@ public class StatsFragment extends Fragment implements TrackDataListener {
    */
   private void updateUi(FragmentActivity activity) {
     StatsUtils.setTripStatisticsValues(activity, lastTripStatistics);
-    StatsUtils.setLocationValues(activity, lastLocation, true);
+    StatsUtils.setLocationValues(activity, lastLocation, isSelectedTrackRecording());
   }
 }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java
index afae9d49c..0bd4fd413 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/PreferencesUtils.java
@@ -98,9 +98,7 @@ public class PreferencesUtils {
   public static final String SHARE_TRACK_DEFAULT = "DRIVE";
   public static final int SPLIT_FREQUENCY_DEFAULT = 0;
   public static final boolean STATS_SHOW_COORDINATE_DEFAULT = false;
-  public static final boolean STATS_SHOW_ELEVATION_DEFAULT = false;
-  public static final boolean STATS_SHOW_GRADE_DEFAULT = false;
-  public static final boolean STATS_SHOW_MOVING_TIME_DEFAULT = false;
+  public static final boolean STATS_SHOW_GRADE_ELEVATION_DEFAULT = false;
   public static final String TRACK_COLOR_MODE_DEFAULT = "SINGLE";
   public static final int TRACK_COLOR_MODE_MEDIUM_DEFAULT = 15;
   public static final int TRACK_COLOR_MODE_PERCENTAGE_DEFAULT = 25;
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/StatsUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/StatsUtils.java
index 42fc0913a..5460b2c50 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/StatsUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/StatsUtils.java
@@ -24,78 +24,87 @@ import android.location.Location;
 import android.view.View;
 import android.widget.TextView;
 
+import java.util.Locale;
+
 /**
  * Utilities for updating the statistics UI labels and values.
- *
+ * 
  * @author Jimmy Shih
  */
 public class StatsUtils {
 
+  private static final String COORDINATE_DEGREE = "\u00B0";
+  private static final String GRADE_PERCENTAGE = "%";
+
+  private static final String ELEVATION_FORMAT = "%1$.2f";
+  private static final String GRADE_FORMAT = "%1$d";
+
   private StatsUtils() {}
 
   /**
    * Sets the location values.
-   *
+   * 
    * @param activity the activity
    * @param location the location
-   * @param showAll true to show all the fields, false to show only the
-   *          elevation field
+   * @param isRecording true if recording
    */
-  public static void setLocationValues(Activity activity, Location location, boolean showAll) {
+  public static void setLocationValues(Activity activity, Location location, boolean isRecording) {
     boolean metricUnits = PreferencesUtils.getBoolean(
         activity, R.string.metric_units_key, PreferencesUtils.METRIC_UNITS_DEFAULT);
     boolean reportSpeed = PreferencesUtils.getBoolean(
         activity, R.string.report_speed_key, PreferencesUtils.REPORT_SPEED_DEFAULT);
 
-    // Set elevation
-    boolean showElevation = PreferencesUtils.getBoolean(
-        activity, R.string.stats_show_elevation_key, PreferencesUtils.STATS_SHOW_ELEVATION_DEFAULT);
-    if (showElevation) {
-      double altitude = location == null ? Double.NaN : location.getAltitude();
-      setElevationValue(activity, R.id.stats_elevation_value, altitude, metricUnits);
-    }
-
-    if (!showAll) {
-      return;
-    }
-
     // Set speed/pace
-    setSpeedLabel(
-        activity, R.id.stats_speed_label, R.string.stats_speed, R.string.stats_pace, reportSpeed);
-    double speed = location == null ? Double.NaN : location.getSpeed();
-    setSpeedValue(activity, R.id.stats_speed_value, speed, metricUnits, reportSpeed);
+    double speed = !isRecording || location == null ? Double.NaN : location.getSpeed();
+    setSpeed(activity, R.id.stats_speed, R.string.stats_speed, R.string.stats_pace, speed,
+        metricUnits, reportSpeed);
+
+    // Set elevation
+    boolean showGradeElevation = PreferencesUtils.getBoolean(activity,
+        R.string.stats_show_grade_elevation_key,
+        PreferencesUtils.STATS_SHOW_GRADE_ELEVATION_DEFAULT);
+    View elevation = activity.findViewById(R.id.stats_elevation);
+
+    if (showGradeElevation && isRecording) {
+      double altitude = location == null ? Double.NaN : location.getAltitude();
+      elevation.setVisibility(View.VISIBLE);
+      setElevationValue(activity, R.id.stats_elevation, -1, altitude, metricUnits);
+    } else {
+      elevation.setVisibility(View.GONE);
+    }
 
     // Set coordinate
     boolean showCoordinate = PreferencesUtils.getBoolean(activity,
         R.string.stats_show_coordinate_key, PreferencesUtils.STATS_SHOW_COORDINATE_DEFAULT);
-    View coordinateLabelTableRow = activity.findViewById(R.id.stats_coordinate_label_table_row);
-    View coordinateValueTableRow = activity.findViewById(R.id.stats_coordinate_value_table_row);
-    if (coordinateLabelTableRow == null || coordinateValueTableRow == null) {
-      return;
-    }
-    coordinateLabelTableRow.setVisibility(showCoordinate ? View.VISIBLE : View.GONE);
-    coordinateValueTableRow.setVisibility(showCoordinate ? View.VISIBLE : View.GONE);
-    if (showCoordinate) {
+    View coordinateHorizontalLine = activity.findViewById(R.id.stats_coordinate_horizontal_line);
+    View coordinateContainer = activity.findViewById(R.id.stats_coordinate_container);
+
+    if (showCoordinate && isRecording) {
       double latitude = location == null ? Double.NaN : location.getLatitude();
       double longitude = location == null ? Double.NaN : location.getLongitude();
-      setCoordinateValue(activity, R.id.stats_latitude_value, latitude);
-      setCoordinateValue(activity, R.id.stats_longitude_value, longitude);
+      coordinateHorizontalLine.setVisibility(View.VISIBLE);
+      coordinateContainer.setVisibility(View.VISIBLE);
+      setCoordinateValue(activity, R.id.stats_latitude, R.string.stats_latitude, latitude);
+      setCoordinateValue(activity, R.id.stats_longitude, R.string.stats_longitude, longitude);
+    } else {
+      coordinateHorizontalLine.setVisibility(View.GONE);
+      coordinateContainer.setVisibility(View.GONE);
     }
   }
 
   /**
    * Sets the total time value.
-   *
+   * 
    * @param activity the activity
    * @param totalTime the total time
    */
   public static void setTotalTimeValue(Activity activity, long totalTime) {
-    setTimeValue(activity, R.id.stats_total_time_value, totalTime);
+    setTimeValue(activity, R.id.stats_total_time, R.string.stats_total_time, totalTime);
   }
 
   /**
    * Sets the trip statistics values.
-   *
+   * 
    * @param activity the activity
    * @param tripStatistics the trip statistics
    */
@@ -104,249 +113,206 @@ public class StatsUtils {
         activity, R.string.metric_units_key, PreferencesUtils.METRIC_UNITS_DEFAULT);
     boolean reportSpeed = PreferencesUtils.getBoolean(
         activity, R.string.report_speed_key, PreferencesUtils.REPORT_SPEED_DEFAULT);
-    boolean showMovingTime = PreferencesUtils.getBoolean(activity,
-        R.string.stats_show_moving_time_key, PreferencesUtils.STATS_SHOW_MOVING_TIME_DEFAULT);
-    
+
     // Set total distance
     double totalDistance = tripStatistics == null ? Double.NaN : tripStatistics.getTotalDistance();
-    setDistanceValue(activity, R.id.stats_distance_value, totalDistance, metricUnits);
-    
+    setDistanceValue(activity, totalDistance, metricUnits);
+
     // Set total time
-    setTimeValue(activity, R.id.stats_total_time_value,
+    setTimeValue(activity, R.id.stats_total_time, R.string.stats_total_time,
         tripStatistics != null ? tripStatistics.getTotalTime() : -1L);
 
-    // Set moving time
-    setItemVisibility(activity, R.id.stats_moving_time_label, R.id.stats_moving_time_spacer,
-        R.id.stats_moving_time_value, showMovingTime);
-    if (showMovingTime) {
-      setTimeValue(activity, R.id.stats_moving_time_value,
-          tripStatistics != null ? tripStatistics.getMovingTime() : -1L);
-    }
-
-    // Set average speed
-    setSpeedLabel(activity, R.id.stats_average_speed_label, R.string.stats_average_speed,
-        R.string.stats_average_pace, reportSpeed);
+    // Set average speed/pace
     double averageSpeed = tripStatistics != null ? tripStatistics.getAverageSpeed() : Double.NaN;
-    setSpeedValue(activity, R.id.stats_average_speed_value, averageSpeed, metricUnits, reportSpeed);
-    
-    // Set average moving speed
-    setItemVisibility(activity, R.id.stats_average_moving_speed_label,
-        R.id.stats_average_moving_speed_spacer, R.id.stats_average_moving_speed_value,
-        showMovingTime);
-    if (showMovingTime) {
-      setSpeedLabel(activity, R.id.stats_average_moving_speed_label,
-          R.string.stats_average_moving_speed, R.string.stats_average_moving_pace, reportSpeed);
-      double averageMovingSpeed = tripStatistics != null ? tripStatistics.getAverageMovingSpeed()
-          : Double.NaN;
-      setSpeedValue(activity, R.id.stats_average_moving_speed_value, averageMovingSpeed,
-          metricUnits, reportSpeed);
-    }
+    setSpeed(activity, R.id.stats_average_speed, R.string.stats_average_speed,
+        R.string.stats_average_pace, averageSpeed, metricUnits, reportSpeed);
 
-    // Set max speed
-    setSpeedLabel(activity, R.id.stats_max_speed_label, R.string.stats_max_speed,
-        R.string.stats_fastest_pace, reportSpeed);
+    // Set moving time
+    setTimeValue(activity, R.id.stats_moving_time, R.string.stats_moving_time,
+        tripStatistics != null ? tripStatistics.getMovingTime() : -1L);
+
+    // Set average moving speed/pace
+    double averageMovingSpeed = tripStatistics != null ? tripStatistics.getAverageMovingSpeed()
+        : Double.NaN;
+    setSpeed(activity, R.id.stats_average_moving_time, R.string.stats_average_moving_speed,
+        R.string.stats_average_moving_pace, averageMovingSpeed, metricUnits, reportSpeed);
+
+    // Set max speed/pace
     double maxSpeed = tripStatistics == null ? Double.NaN : tripStatistics.getMaxSpeed();
-    setSpeedValue(activity, R.id.stats_max_speed_value, maxSpeed, metricUnits, reportSpeed);
-    
-    // Set elevation
-    boolean showElevation = PreferencesUtils.getBoolean(
-        activity, R.string.stats_show_elevation_key, PreferencesUtils.STATS_SHOW_ELEVATION_DEFAULT);
-    View elevationLabelTableRow1 = activity.findViewById(R.id.stats_elevation_label_table_row1);
-    View elevationValueTableRow1 = activity.findViewById(R.id.stats_elevation_value_table_row1);
-    View elevationLabelTableRow2 = activity.findViewById(R.id.stats_elevation_label_table_row2);
-    View elevationValueTableRow2 = activity.findViewById(R.id.stats_elevation_value_table_row2);
-    if (elevationLabelTableRow1 == null 
-        || elevationValueTableRow1 == null
-        || elevationLabelTableRow2 == null 
-        || elevationValueTableRow2 == null) {
-      return;
-    }
-    elevationLabelTableRow1.setVisibility(showElevation ? View.VISIBLE : View.GONE);
-    elevationValueTableRow1.setVisibility(showElevation ? View.VISIBLE : View.GONE);
-    elevationLabelTableRow2.setVisibility(showElevation ? View.VISIBLE : View.GONE);
-    elevationValueTableRow2.setVisibility(showElevation ? View.VISIBLE : View.GONE);
-    if (showElevation) {
+    setSpeed(activity, R.id.stats_max_speed, R.string.stats_max_speed, R.string.stats_fastest_pace,
+        maxSpeed, metricUnits, reportSpeed);
+
+    // Set grade/elevation
+    boolean showGradeElevation = PreferencesUtils.getBoolean(activity,
+        R.string.stats_show_grade_elevation_key,
+        PreferencesUtils.STATS_SHOW_GRADE_ELEVATION_DEFAULT);
+    View gradeElevationHorizontalLine = activity.findViewById(
+        R.id.stats_grade_elevation_horizontal_line);
+    View gradeElevationContainer = activity.findViewById(R.id.stats_grade_elevation_container);
+
+    if (showGradeElevation) {
+      gradeElevationHorizontalLine.setVisibility(View.VISIBLE);
+      gradeElevationContainer.setVisibility(View.VISIBLE);
+      // Set grade
+      double minGrade = tripStatistics == null ? Double.NaN : tripStatistics.getMinGrade();
+      double maxGrade = tripStatistics == null ? Double.NaN : tripStatistics.getMaxGrade();
+      setGradeValue(activity, R.id.stats_grade_min, R.string.stats_min, minGrade);
+      setGradeValue(activity, R.id.stats_grade_max, R.string.stats_max, maxGrade);
+
+      // Set elevation
       double elevationGain = tripStatistics == null ? Double.NaN
           : tripStatistics.getTotalElevationGain();
       double minElevation = tripStatistics == null ? Double.NaN : tripStatistics.getMinElevation();
       double maxElevation = tripStatistics == null ? Double.NaN : tripStatistics.getMaxElevation();
-      setElevationValue(activity, R.id.stats_elevation_gain_value, elevationGain, metricUnits);
-      setElevationValue(activity, R.id.stats_min_elevation_value, minElevation, metricUnits);
-      setElevationValue(activity, R.id.stats_max_elevation_value, maxElevation, metricUnits);
-    }
-
-    // Set grade
-    boolean showGrade = PreferencesUtils.getBoolean(
-        activity, R.string.stats_show_grade_key, PreferencesUtils.STATS_SHOW_GRADE_DEFAULT);
-    View gradeLabelTableRow = activity.findViewById(R.id.stats_grade_label_table_row);
-    View gradeValueTableRow = activity.findViewById(R.id.stats_grade_value_table_row);
-    if (gradeLabelTableRow == null || gradeValueTableRow == null) {
-      return;
-    }
-    gradeLabelTableRow.setVisibility(showGrade ? View.VISIBLE : View.GONE);
-    gradeValueTableRow.setVisibility(showGrade ? View.VISIBLE : View.GONE);
-    if (showGrade) {
-      double minGrade = tripStatistics == null ? Double.NaN : tripStatistics.getMinGrade();
-      double maxGrade = tripStatistics == null ? Double.NaN : tripStatistics.getMaxGrade();
-      setGradeValue(activity, R.id.stats_min_grade_value, minGrade);
-      setGradeValue(activity, R.id.stats_max_grade_value, maxGrade);
-    }
-  }
-
-  private static void setItemVisibility(
-      Activity activity, int labelId, int spacerId, int valueId, boolean show) {
-    View label = activity.findViewById(labelId);
-    View spacer = activity.findViewById(spacerId);
-    View value = activity.findViewById(valueId);
-    if (label != null) {
-      label.setVisibility(show ? View.VISIBLE : View.GONE);
-    }
-    if (spacer != null) {
-      spacer.setVisibility(show ? View.VISIBLE : View.GONE);
-    }
-    if (value != null) {
-      value.setVisibility(show ? View.VISIBLE : View.GONE);
+      setElevationValue(
+          activity, R.id.stats_elevation_gain, R.string.stats_gain, elevationGain, metricUnits);
+      setElevationValue(
+          activity, R.id.stats_elevation_min, R.string.stats_min, minElevation, metricUnits);
+      setElevationValue(
+          activity, R.id.stats_elevation_max, R.string.stats_max, maxElevation, metricUnits);
+    } else {
+      gradeElevationHorizontalLine.setVisibility(View.GONE);
+      gradeElevationContainer.setVisibility(View.GONE);
     }
   }
 
   /**
-   * Sets a speed label.
-   *
+   * Sets speed.
+   * 
    * @param activity the activity
-   * @param id the speed label resource id
-   * @param speedId the speed string id
-   * @param paceId the pace string id
-   * @param reportSpeed true to report speed
-   */
-  private static void setSpeedLabel(
-      Activity activity, int id, int speedId, int paceId, boolean reportSpeed) {
-    TextView textView = (TextView) activity.findViewById(id);
-    if (textView == null) {
-      return;
-    }
-    textView.setText(reportSpeed ? speedId : paceId);
-  }
-
-  /**
-   * Sets a speed value.
-   *
-   * @param activity the activity
-   * @param id the speed value resource id
+   * @param itemId the item id
+   * @param speedLabelId the speed label id
+   * @param paceLabelId the pace label id
    * @param speed the speed in meters per second
-   * @param metricUnits true to display in metric units
-   * @param reportSpeed true to report speed
+   * @param metricUnits true if metric units
+   * @param reportSpeed true if report speed
    */
-  private static void setSpeedValue(
-      Activity activity, int id, double speed, boolean metricUnits, boolean reportSpeed) {
-    TextView textView = (TextView) activity.findViewById(id);
-    if (textView == null) {
-      return;
-    }
-    textView.setText(StringUtils.formatSpeed(activity, speed, metricUnits, reportSpeed));
+  private static void setSpeed(Activity activity, int itemId, int speedLabelId, int paceLabelId,
+      double speed, boolean metricUnits, boolean reportSpeed) {
+    String parts[] = StringUtils.getSpeedParts(activity, speed, metricUnits, reportSpeed);
+    setItem(activity, itemId, reportSpeed ? speedLabelId : paceLabelId, parts[0], parts[1]);
   }
 
   /**
-   * Sets a distance value.
-   *
+   * Sets distance value.
+   * 
    * @param activity the activity
-   * @param id the distance value resource id
    * @param distance the distance in meters
-   * @param metricUnits true to display in metric units
+   * @param metricUnits true if metric units
    */
-  private static void setDistanceValue(
-      Activity activity, int id, double distance, boolean metricUnits) {
-    TextView textView = (TextView) activity.findViewById(id);
-    if (textView == null) {
-      return;
-    }
-    textView.setText(StringUtils.formatDistance(activity, distance, metricUnits));
+  private static void setDistanceValue(Activity activity, double distance, boolean metricUnits) {
+    String parts[] = StringUtils.getDistanceParts(activity, distance, metricUnits);
+    setItem(activity, R.id.stats_distance, R.string.stats_distance, parts[0], parts[1]);
   }
 
   /**
    * Sets a time value.
-   *
+   * 
    * @param activity the activity
-   * @param id the time value resource id
+   * @param itemId the item id
+   * @param labelId the label id
    * @param time the time
    */
-  private static void setTimeValue(Activity activity, int id, long time) {
-    TextView textView = (TextView) activity.findViewById(id);
-    if (textView == null) {
-      return;
-    }
+  private static void setTimeValue(Activity activity, int itemId, int labelId, long time) {
     String value = time == -1L ? activity.getString(R.string.value_unknown)
         : StringUtils.formatElapsedTime(time);
-    textView.setText(value);
+    setItem(activity, itemId, labelId, value, null);
   }
 
   /**
    * Sets an elevation value.
-   *
+   * 
    * @param activity the activity
-   * @param id the elevation value resource id
+   * @param itemId the item id
+   * @param labelId the label id
    * @param elevation the elevation in meters
-   * @param metricUnits true to display in metric units
+   * @param metricUnits true if metric units
    */
   private static void setElevationValue(
-      Activity activity, int id, double elevation, boolean metricUnits) {
-    TextView textView = (TextView) activity.findViewById(id);
-    if (textView == null) {
-      return;
-    }
+      Activity activity, int itemId, int labelId, double elevation, boolean metricUnits) {
     String value;
+    String unit;
     if (Double.isNaN(elevation) || Double.isInfinite(elevation)) {
-      value = activity.getString(R.string.value_unknown);
+      value = null;
+      unit = null;
     } else {
       if (metricUnits) {
-        value = activity.getString(R.string.value_float_meter, elevation);
+        value = String.format(Locale.getDefault(), ELEVATION_FORMAT, elevation);
+        unit = activity.getString(R.string.unit_meter);
       } else {
         elevation *= UnitConversions.M_TO_FT;
-        value = activity.getString(R.string.value_float_feet, elevation);
+        value = String.format(Locale.getDefault(), ELEVATION_FORMAT, elevation);
+        unit = activity.getString(R.string.unit_feet);
       }
     }
-    textView.setText(value);
+    setItem(activity, itemId, labelId, value, unit);
   }
 
   /**
    * Sets a grade value.
-   *
+   * 
    * @param activity the activity
-   * @param id the grade value resource id
+   * @param itemId the item id
+   * @param labelId the label id
    * @param grade the grade in fraction between 0 and 1
    */
-  private static void setGradeValue(Activity activity, int id, double grade) {
-    TextView textView = (TextView) activity.findViewById(id);
-    if (textView == null) {
-      return;
-    }
-    String value;
-    if (Double.isNaN(grade) || Double.isInfinite(grade)) {
-      value = activity.getString(R.string.value_unknown);
-    } else {
-      value = activity.getString(R.string.value_integer_percent, Math.round(grade * 100));
-    }
-    textView.setText(value);
+  private static void setGradeValue(Activity activity, int itemId, int labelId, double grade) {
+    String value = Double.isNaN(grade) || Double.isInfinite(grade) ? null
+        : String.format(Locale.getDefault(), GRADE_FORMAT, Math.round(grade * 100));
+    setItem(activity, itemId, labelId, value, GRADE_PERCENTAGE);
   }
 
   /**
    * Sets a coordinate value.
-   *
+   * 
    * @param activity the activity
-   * @param id the coordinate value resource id
+   * @param itemId the item id
+   * @param labelId the label id
    * @param coordinate the coordinate in degrees
    */
-  private static void setCoordinateValue(Activity activity, int id, double coordinate) {
-    TextView textView = (TextView) activity.findViewById(id);
-    if (textView == null) {
+  private static void setCoordinateValue(
+      Activity activity, int itemId, int labelId, double coordinate) {
+    String value = Double.isNaN(coordinate) || Double.isInfinite(coordinate) ? null
+        : Location.convert(coordinate, Location.FORMAT_DEGREES);
+    setItem(activity, itemId, labelId, value, COORDINATE_DEGREE);
+  }
+
+  /**
+   * Sets an item.
+   * 
+   * @param activity the activity
+   * @param itemId the item id
+   * @param labelId the label id. -1 to hide the label
+   * @param value the value, can be null
+   * @param unit the unit. Null to hide the unit
+   */
+  private static void setItem(
+      Activity activity, int itemId, int labelId, String value, String unit) {
+    View view = activity.findViewById(itemId);
+    TextView labelTextView = (TextView) view.findViewById(R.id.stats_label);
+    TextView valueTextView = (TextView) view.findViewById(R.id.stats_value);
+    TextView unitTextView = (TextView) view.findViewById(R.id.stats_unit);
+    if (labelTextView == null || valueTextView == null || unitTextView == null) {
       return;
     }
-    String value;
-    if (Double.isNaN(coordinate) || Double.isInfinite(coordinate)) {
-      value = activity.getString(R.string.value_unknown);
+    if (labelId == -1) {
+      labelTextView.setVisibility(View.GONE);
     } else {
-      value = activity.getString(
-          R.string.value_coordinate_degree, Location.convert(coordinate, Location.FORMAT_DEGREES));
+      labelTextView.setVisibility(View.VISIBLE);
+      labelTextView.setText(labelId);
     }
-    textView.setText(value);
+
+    if (value == null) {
+      value = activity.getString(R.string.value_unknown);
+      unitTextView.setVisibility(View.GONE);
+    } else {
+      if (unit == null) {
+        unitTextView.setVisibility(View.GONE);
+      } else {
+        unitTextView.setVisibility(View.VISIBLE);
+        unitTextView.setText(unit);
+      }
+    }
+    valueTextView.setText(value);
   }
 }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java
index 8aac97b16..0e09a817e 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/StringUtils.java
@@ -188,40 +188,6 @@ public class StringUtils {
     return result;
   }
 
-  /**
-   * Formats the speed.
-   * 
-   * @param context the context
-   * @param speed the speed in meters per second
-   * @param metricUnits true to use metric units. False to use imperial units
-   * @param reportSpeed true to report as speed. False to report as pace
-   */
-  public static String formatSpeed(
-      Context context, double speed, boolean metricUnits, boolean reportSpeed) {
-    if (Double.isNaN(speed) || Double.isInfinite(speed)) {
-      return context.getString(R.string.value_unknown);
-    }
-    speed *= UnitConversions.MS_TO_KMH;
-    if (metricUnits) {
-      if (reportSpeed) {
-        return context.getString(R.string.value_float_kilometer_hour, speed);
-      } else {
-        // convert from hours to minutes
-        double pace = speed == 0 ? 0.0 : 60.0 / speed;
-        return context.getString(R.string.value_float_minute_kilometer, pace);
-      }
-    } else {
-      speed *= UnitConversions.KM_TO_MI;
-      if (reportSpeed) {
-        return context.getString(R.string.value_float_mile_hour, speed);
-      } else {
-        // convert from hours to minutes
-        double pace = speed == 0 ? 0.0 : 60.0 / speed;
-        return context.getString(R.string.value_float_minute_mile, pace);
-      }
-    }
-  }
-
   /**
    * Gets the speed in an array of two strings. The first string is the speed.
    * The second string is the unit. The first string is null if speed is
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/util/StringUtilsTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/util/StringUtilsTest.java
index a2ca52478..8e03ef044 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/util/StringUtilsTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/util/StringUtilsTest.java
@@ -90,28 +90,6 @@ public class StringUtilsTest extends AndroidTestCase {
     assertEquals("328.08 ft", StringUtils.formatDistance(getContext(), 100, false));
   }
 
-  /**
-   * Tests {@link StringUtils#formatSpeed(android.content.Context, double,
-   * boolean, boolean)}.
-   */
-  public void testFormatSpeed() {
-    // Speed in metric
-    assertEquals("36.00 km/h", StringUtils.formatSpeed(getContext(), 10, true, true));
-    // Speed in imperial
-    assertEquals("22.37 mi/h", StringUtils.formatSpeed(getContext(), 10, false, true));
-    // Pace in metric
-    assertEquals("1.67 min/km", StringUtils.formatSpeed(getContext(), 10, true, false));
-    // Pace in imperial
-    assertEquals("2.68 min/mi", StringUtils.formatSpeed(getContext(), 10, false, false));
-    // zero pace
-    assertEquals("0.00 min/km", StringUtils.formatSpeed(getContext(), 0, true, false));
-    assertEquals("0.00 min/mi", StringUtils.formatSpeed(getContext(), 0, false, false));
-    // speed is NaN
-    assertEquals("-", StringUtils.formatSpeed(getContext(), Double.NaN, true, true));
-    // speed is infinite
-    assertEquals("-", StringUtils.formatSpeed(getContext(), Double.NEGATIVE_INFINITY, true, true));
-  }
-
   /**
    * Tests {@link StringUtils#formatCData(String)}.
    */
diff --git a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
index 73778fb24..2bcc42859 100644
--- a/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
+++ b/MyTracksTest_E2E/src/com/google/android/apps/mytracks/endtoendtest/SettingTest.java
@@ -211,7 +211,8 @@ public class SettingTest extends ActivityInstrumentationTestCase2<TrackListActiv
       EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.stats_elevation));
     }
     if (changeGrade) {
-      EndToEndTestUtils.SOLO.clickOnText(activityMyTracks.getString(R.string.settings_stats_grade));
+      EndToEndTestUtils.SOLO.clickOnText(
+          activityMyTracks.getString(R.string.settings_stats_grade_elevation));
     }
     if (changeLatLong) {
       EndToEndTestUtils.SOLO.clickOnText(activityMyTracks