Removed calories and weight.

myTracks/src/main/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_calorie" />
+      layout="@layout/stats_activity_type" />
     <View
       android:layout_height="match_parent"
       android:layout_width="1dp"

myTracks/src/main/res/layout/choose_activity_type.xml

@@ -27,29 +27,4 @@ limitations under the License.
     android:padding="4dp"
     android:stretchMode="spacingWidth"
     android:verticalSpacing="4dp" />
-  <LinearLayout
-    android:id="@+id/choose_activity_type_weight_container"
-    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
-    android:orientation="vertical" >
-    <TextView
-      android:id="@+id/choose_activity_type_weight_label"
-      android:layout_marginBottom="2dp"
-      android:layout_marginLeft="16dp"
-      android:layout_marginRight="16dp"
-      android:layout_marginTop="4dp"
-      android:paddingLeft="12dp"
-      style="@style/TextMedium" />
-    <EditText
-      android:id="@+id/choose_activity_type_weight"
-      android:inputType="numberDecimal"
-      android:layout_marginBottom="4dp"
-      android:layout_marginLeft="16dp"
-      android:layout_marginRight="16dp"
-      android:layout_marginTop="2dp"
-      android:layout_width="match_parent"
-      android:selectAllOnFocus="true"
-      android:singleLine="true"
-      style="@style/TextMedium" />
-  </LinearLayout>
 </LinearLayout>

myTracks/src/main/res/layout/stats_activity_type.xml

@@ -22,15 +22,6 @@ limitations under the License.
     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"

myTracks/src/main/res/layout/stats_content.xml

@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <merge xmlns:android="http://schemas.android.com/apk/res/android" >
-  <!-- Distance and calorie -->
+  <!-- Distance and activity type -->
   <LinearLayout
     android:layout_height="wrap_content"
     android:layout_width="match_parent" >
@@ -24,7 +24,7 @@ limitations under the License.
       layout="@layout/stats_large_item" />
     <include
       android:id="@+id/stats_calorie"
-      layout="@layout/stats_calorie" />
+      layout="@layout/stats_activity_type" />
   </LinearLayout>
   <!-- Total time and moving time -->
   <LinearLayout

myTracks/src/main/res/values/strings.xml

@@ -529,14 +529,6 @@ limitations under the License.
     translation_description="Label for a track segment">
     Segment
   </string>
-  <string name="description_weight_imperial"
-    translation_description="Label for weight in pounds.">
-    Weight (lb)
-  </string>
-  <string name="description_weight_metric"
-    translation_description="Label for weight in kilograms.">
-    Weight (kg)
-  </string>
 
   <!-- Eula -->
   <string name="eula_accept"
@@ -1988,18 +1980,6 @@ limitations under the License.
       Character limit: ~23 (1 line)">
     Elevation
   </string>
-  <string name="stats_calorie"
-    translation_description="In the 'Stats' page, the calorie burned.
-
-      Character limit: ~23 (1 line)">
-    Calories
-  </string>
-  <string name="stats_calorie_no_calculation"
-    translation_description="In the 'Stats' page, the message when calories cannot be calculated.
-
-      %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.">
     Fastest pace
@@ -2283,10 +2263,6 @@ limitations under the License.
     translation_description="Abbreviation for minutes per mile. E.g., '5 min/mi'.">
     min/mi
   </string>
-  <string name="unit_calorie"
-    translation_description="Abbreviation for calorie. E.g., '5 Cal'.">
-    Cal
-  </string>
 
   <!-- Value -->
   <string name="value_adapt_accuracy"