Merge heads

2013-10-10 13:50:09 +08:00
parent e94b7768dc 8e9be4fcf0
commit ddecd50ef6
18 changed files with 251 additions and 56 deletions
@@ -142,5 +142,12 @@ limitations under the License.
    <include
      android:id="@+id/stats_calorie"
      layout="@layout/stats_small_item" />
+    <!-- Setup activity type-->
+    <Button
+      android:id="@+id/stats_calorie_setup"
+      android:layout_gravity="right"
+      android:layout_height="wrap_content"
+      android:layout_width="match_parent"
+      android:text="@string/stats_calorie_setup" />
  </LinearLayout>
 </merge>
@@ -2141,6 +2141,12 @@ 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.
+    
+      Character limit: ~23 (1 line)">
+    Setup Activity Type
+  </string>
  <string name="stats_fastest_pace"
    translation_description="In the 'Stats' page, the fastest pace.">
    Fastest pace