merge heads

MyTracks/res/layout/track_edit.xml

@@ -35,7 +35,7 @@ limitations under the License.
       <TextView
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
-        android:text="@string/track_detail_track_name"
+        android:text="@string/track_edit_track_name"
         />
       <LinearLayout
         android:layout_height="wrap_content"
@@ -53,8 +53,8 @@ limitations under the License.
           />
         <EditText
           android:inputType="textAutoCorrect|textCapWords"
-          android:hint="@string/track_detail_track_name"
-          android:id="@+id/track_detail_track_name"
+          android:hint="@string/track_edit_track_name"
+          android:id="@+id/track_edit_track_name"
           android:imeOptions="actionNext"
           android:layout_height="wrap_content"
           android:layout_width="fill_parent"
@@ -65,24 +65,24 @@ limitations under the License.
       <TextView
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
-        android:text="@string/track_detail_activity_type"
+        android:text="@string/track_edit_activity_type"
         />
       <AutoCompleteTextView
-        android:id="@+id/track_detail_activity_type"
+        android:id="@+id/track_edit_activity_type"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:singleLine="true"
-        android:hint="@string/track_detail_activity_type_hint"
+        android:hint="@string/track_edit_activity_type_hint"
         android:imeOptions="actionNext"/>
       <TextView
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
-        android:text="@string/track_detail_track_description"
+        android:text="@string/track_edit_track_description"
         />
       <EditText
         android:inputType="textAutoCorrect|textCapSentences"
-        android:hint="@string/track_detail_track_description"
-        android:id="@+id/track_detail_track_description"
+        android:hint="@string/track_edit_track_description"
+        android:id="@+id/track_edit_track_description"
         android:imeOptions="actionDone"
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
@@ -95,13 +95,13 @@ limitations under the License.
   <LinearLayout style="@style/ButtonLayout">
     <LinearLayout style="@style/ButtonSpacer"/>
     <Button
-      android:id="@+id/track_detail_save"
+      android:id="@+id/track_edit_save"
       android:layout_gravity="left"
       android:text="@string/generic_save"
       style="@style/Button"
       />
     <Button
-      android:id="@+id/track_detail_cancel"
+      android:id="@+id/track_edit_cancel"
       android:layout_gravity="right"
       android:text="@string/generic_cancel"
       style="@style/Button"

MyTracks/res/values/strings.xml

@@ -2237,40 +2237,33 @@ limitations under the License.
     Total time
   </string>
 
-  <!-- Track -->
-  <string name="track_detail_activity_type"
-    translation_description="In the detail page for a track, the text field for the activity type,
-      including for examples.
-
-      Screenshot: track_detail.png">
+  <!-- Track Edit -->
+  <string name="track_edit_activity_type"
+    translation_description="In the page to edit a track, the title for the text field to edit the
+      activity type, including some examples of activity types.">
     Activity type (e.g. hiking, cycling, running...)
   </string>
-  <string name="track_detail_activity_type_hint"
-    translation_description="In the detail page for a track, the hint in the 'Activity type' text
-      field when it is empty.
-
-      Screenshot: track_detail.png">
+  <string name="track_edit_activity_type_hint"
+    translation_description="In the page to edit a track, the hint in the 'Activity type' text field
+      when it is empty.">
     Activity type
   </string>
-  <string name="track_detail_title"
-    translation_description="In the detail page for a track, the title of the page.
-
-      Screenshot: track_detail.png">
-    Track details
+  <string name="track_edit_title"
+    translation_description="The title of the page to edit a track.">
+    Edit track
   </string>
-  <string name="track_detail_track_description"
-    translation_description="In the detail page for a track, the text field for the track
-      description.
-
-      Screenshot: track_detail.png">
+  <string name="track_edit_track_description"
+    translation_description="In the page to edit a track, the title for the text field to edit the
+      track description.">
     Track description
   </string>
-  <string name="track_detail_track_name"
-    translation_description="In the detail page for a track, the text field for the track name.
-
-      Screenshot: track_detail.png">
+  <string name="track_edit_track_name"
+    translation_description="In the page to edit a track, the title for the text field to edit the
+      track name.">
     Track name
   </string>
+
+  <!-- Track -->
   <string name="track_icon_description"
     translation_description="The accessibility description for the track icon.">
     Track