merge heads

MyTracks/res/values/keys.xml

@@ -42,8 +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>
   <string name="track_color_mode_percentage_key">trackColorModePercentage</string>
@@ -70,6 +68,7 @@ limitations under the License.
   <string name="google_account_key">googleAccount</string>
   <string name="recording_track_id_key">recordingTrackId</string>
   <string name="recording_track_paused_key">recordingTrackPaused</string>
+  <string name="weight_key">weight</string>
   <!-- Keys for non-persisted preferences. Sorted alphabetically. DO NOT TRANSLATE. -->
   <string name="settings_advanced_key">settingsAdvanced</string>
   <string name="settings_backup_key">settingsBackup</string>

MyTracks/res/values/strings.xml

@@ -555,7 +555,15 @@ 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"
     translation_description="In the 'Terms of Service' dialog, the button to accept.">
@@ -2025,16 +2033,6 @@ limitations under the License.
       Character limit: ~23 (1 line)">
     Grade/Elevation
   </string>
-  <string name="settings_stats_calorie_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).
@@ -2157,11 +2155,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.">
@@ -2514,12 +2512,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 +2586,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).

MyTracks/res/values/styles.xml

@@ -30,7 +30,6 @@ limitations under the License.
   <style name="BottomButtonBar">
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">match_parent</item>
-    <item name="android:orientation">horizontal</item>
   </style>
   <!-- bottom button divider -->
   <style name="BottomButtonDivider">
@@ -84,7 +83,7 @@ limitations under the License.
     <item name="android:layout_marginBottom">8dp</item>
     <item name="android:layout_marginLeft">20dp</item>
     <item name="android:layout_width">match_parent</item>
-  </style> 
+  </style>
   <!-- help answer -->
   <style name="HelpAnswer" parent="@style/TextSmall">
     <item name="android:autoLink">web</item>
@@ -133,30 +132,31 @@ limitations under the License.
   <style name="StatsHorizontalLine">
     <item name="android:background">@color/stats_separator</item>
     <item name="android:layout_height">1dp</item>
+    <item name="android:layout_marginLeft">8dp</item>
+    <item name="android:layout_marginRight">8dp</item>
     <item name="android:layout_width">match_parent</item>
   </style>
   <!-- stats large item container -->
   <style name="StatsLargeItemContainer">
-    <item name="android:layout_gravity">top</item>
+    <item name="android:layout_gravity">center</item>
     <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_weight">10</item>
+    <item name="android:layout_weight">1</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: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:gravity">center</item>
+    <item name="android:layout_gravity">center</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_gravity">bottom</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">wrap_content</item>
     <item name="android:singleLine">true</item>
@@ -166,7 +166,7 @@ limitations under the License.
   </style>
   <!-- stats large value container -->
   <style name="StatsLargeValueContainer">
-    <item name="android:layout_gravity">right</item>
+    <item name="android:layout_gravity">center</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_marginTop">-4dp</item>
     <item name="android:layout_width">wrap_content</item>
@@ -174,20 +174,26 @@ limitations under the License.
   <!-- stats scroll view -->
   <style name="StatsScrollView" parent="@style/ScrollView">
     <item name="android:scrollbarStyle">outsideOverlay</item>
-  </style>  
-  <!-- stats small item container -->
+  </style>
+  <!-- stats small group container -->
+  <style name="StatsSmallGroupContainer" parent="@style/StatsLargeItemContainer">
+    <item name="android:layout_gravity">top|center</item>
+    <item name="android:paddingTop">12dp</item>
+  </style>
+  <!-- stats small item container, for placing inside StatsSmallGroupContainer -->
   <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:gravity">center</item>
+    <item name="android:layout_gravity">center</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:layout_gravity">bottom</item>
     <item name="android:singleLine">true</item>
     <item name="android:textColor">@android:color/white</item>
   </style>
@@ -197,20 +203,15 @@ limitations under the License.
   </style>
   <!-- stats unit -->
   <style name="StatsUnit" parent="@style/TextSmall">
+    <item name="android:layout_gravity">bottom</item>
     <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>
- <style name="Text">
+  <style name="Text">
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">wrap_content</item>
     <item name="android:textColor">@android:color/white</item>
- </style>   
+  </style>
   <!-- text choose activity -->
   <style name="TextChooseActivity">
     <item name="android:textSize">18sp</item>
@@ -257,7 +258,6 @@ limitations under the License.
     <item name="android:layout_height">0dp</item>
     <item name="android:layout_weight">1</item>
     <item name="android:layout_width">match_parent</item>
-    <item name="android:orientation">horizontal</item>
     <item name="android:paddingBottom">4dp</item>
     <item name="android:paddingTop">4dp</item>
   </style>
@@ -290,7 +290,6 @@ limitations under the License.
   <style name="TrackWidgetHorizontalSeparator">
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">match_parent</item>
-    <item name="android:orientation">horizontal</item>
   </style>
   <!-- track widget item container -->
   <style name="TrackWidgetItemContainer">
@@ -354,7 +353,7 @@ limitations under the License.
     <item name="android:layout_weight">2</item>
     <item name="android:layout_width">0dp</item>
     <item name="android:singleLine">true</item>
-  </style>  
+  </style>
   <!-- track widget stats container -->
   <style name="TrackWidgetStatsContainer">
     <item name="android:clickable">true</item>
@@ -369,7 +368,6 @@ limitations under the License.
     <item name="android:layout_height">0dp</item>
     <item name="android:layout_weight">1</item>
     <item name="android:layout_width">match_parent</item>
-    <item name="android:orientation">horizontal</item>
   </style>
   <!-- track widget unit -->
   <style name="TrackWidgetUnit">
@@ -412,7 +410,6 @@ limitations under the License.
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_marginTop">-4dp</item>
     <item name="android:layout_width">wrap_content</item>
-    <item name="android:orientation">horizontal</item>
   </style>
   <!-- track widget value container 4x3 -->
   <style name="TrackWidgetValueContainer4x3" parent="@style/TrackWidgetValueContainer">