Cleanup calorie settings

MyTracks/res/values/keys.xml

@@ -42,7 +42,6 @@ limitations under the License.
   <string name="stats_rate_key">statsRate</string>
   <string name="stats_show_coordinate_key">statsShowCoordinate</string>
   <string name="stats_show_grade_elevation_key">statsShowGradeElevation</string>
-  <string name="stats_show_calorie_key">statsShowCalorie</string>
   <string name="stats_weight_key">statsWeight</string>
   <string name="stats_units_key">statsUnits</string>
   <string name="track_color_mode_medium_key">trackColorModeMedium</string>
@@ -93,4 +92,5 @@ limitations under the License.
   <string name="settings_sensor_bluetooth_pairing_key">settingsSensorBluetoothPairing</string>
   <string name="settings_sensor_root_key">settingsSensorRoot</string>
   <string name="settings_stats_key">settingsStats</string>
+  <string name="settings_stats_weight_display_key">settingsStatsWeightDisplay</string>
 </resources>

MyTracks/res/values/strings.xml

@@ -2025,16 +2025,12 @@ limitations under the License.
       Character limit: ~23 (1 line)">
     Grade/Elevation
   </string>
-  <string name="settings_stats_calorie_weight"
+  <string name="settings_stats_weight"
     translation_description="In the 'Stats settings, the option to configure user's weight.
 
       Character limit: ~23 (1 line)">
     Weight
   </string>
-  <string name="settings_stats_calorie_weight_description"
-    translation_description="In the 'Stats settings, the description message about weight setting item.">
-    Weight for calculating calories.
-  </string>
   <string name="settings_stats_rate_title"
     translation_description="In the 'Stats' settings, the option to change the preferred rate,
       either speed (mi/hr) or pace (min/mi).
@@ -2487,6 +2483,12 @@ limitations under the License.
       %1$.1f a float number. E.g., '2.2'.">
     %1$.1f mi (poor GPS)
   </string>
+  <string name="value_kilogram"
+    translation_description="Display a value in kilogram (kg).
+
+      %1$s a value. E.g., '150.2'.">
+    %1$s kg
+  </string>
   <string name="value_integer_feet"
     translation_description="In a setting picker, the string format to display an integer value in
       feet (ft).
@@ -2514,12 +2516,6 @@ limitations under the License.
       %1$d an integer value. E.g., '2'.">
     %1$d kB
   </string>
-  <string name="value_integer_kilogram"
-    translation_description="Display an integer value in kilogram (kg).
-
-      %1$d an integer value. E.g., '2'.">
-    %1$d kg
-  </string>
   <string name="value_integer_kilometer"
     translation_description="In a setting picker, the string format to display an integer value in
       kilometers (km).
@@ -2594,12 +2590,6 @@ limitations under the License.
       %1$d an integer value. E.g., '2'.">
     %1$d %%
   </string>
-  <string name="value_integer_pound"
-    translation_description="Display an integer value in pound (lb).
-
-      %1$d an integer value. E.g., '2'.">
-    %1$d lb
-  </string>
   <string name="value_integer_second"
     translation_description="In a setting picker, the string format to display an integer value in
       seconds (s).
@@ -2619,6 +2609,12 @@ limitations under the License.
     translation_description="In a setting picker, the value to turn off the feature.">
     Off
   </string>
+  <string name="value_pound"
+    translation_description="Display a value in pound (lb).
+
+      %1$s a value. E.g., '155.2'.">
+    %1$s lb
+  </string>
   <string name="value_smallest"
     translation_description="In a setting picker, the value to use the smallest value.">
     Smallest