Add support to show both moving time and total time.

MyTracks/res/values/keys.xml

@@ -53,7 +53,7 @@ limitations under the License.
   <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_use_total_time_key">statsUseTotalTime</string>
+  <string name="stats_show_moving_time_key">statsShowMovingTime</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>

MyTracks/res/values/strings.xml

@@ -2038,13 +2038,6 @@ limitations under the License.
       Character limit: ~23 (1 line)">
     Preferred rate
   </string>
-  <string name="settings_stats_time_title"
-    translation_description="In the 'Stats' settings, the option to change the time measurement,
-      either total time or moving time.
-
-      Character limit: ~23 (1 line)">
-    Time measurement
-  </string>
   <string name="settings_stats_units_imperial"
     translation_description="In the 'Stats' settings, the option to use imperial units, with
       examples.">

MyTracks/res/values/styles.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.
 -->
-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
   <!-- The style for the about value -->
   <style name="AboutValue" parent="@style/TextMedium">
     <item name="android:paddingLeft">48dp</item>
@@ -180,10 +180,6 @@ limitations under the License.
   </style>
   <!-- Theme selector -->
   <style name="ThemeSelector" parent="android:Theme" />
-  <!-- The style for the track widget label -->
-  <style name="TrackWidgetLabel" parent="@style/TextSmall">
-    <item name="android:width">100dp</item>
-  </style>
   <!-- The style for the track widget button -->
   <style name="TrackWidgetButton">
     <item name="android:layout_gravity">center_horizontal</item>
@@ -192,6 +188,22 @@ limitations under the License.
     <item name="android:layout_width">fill_parent</item>
     <item name="android:padding">8dp</item>
   </style>
+  <!-- The style for the track widget label -->
+  <style name="TrackWidgetLabel" parent="@style/TextSmall">
+    <item name="android:width">100dp</item>
+  </style>
+  <!-- The style for the track widget separator -->
+  <style name="TrackWidgetSeparator">
+    <item name="android:background">@color/track_widget_line</item>
+    <item name="android:layout_height">1dp</item>
+    <item name="android:layout_width">fill_parent</item>
+  </style>
+  <!-- The style for the track widget stat -->
+  <style name="TrackWidgetStat">
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_width">fill_parent</item>
+    <item name="android:orientation">horizontal</item>
+  </style>
   <!-- The style for the track widget value -->
   <style name="TrackWidgetValue" parent="@style/TextSmall">
     <item name="android:layout_weight">1</item>