Add relative date time for start time within the past week.

Place the list item on the right by itself.

MyTracks/res/layout/list_item.xml

@@ -19,41 +19,53 @@ limitations under the License.
   android:layout_height="wrap_content"
   android:layout_width="fill_parent"
   android:minHeight="?android:attr/listPreferredItemHeight"
-  android:orientation="vertical"
+  android:orientation="horizontal"
   android:padding="8dp" >
+  <ImageView
+    android:contentDescription="@string/icon_track"
+    android:id="@+id/list_item_icon"
+    android:layout_height="wrap_content"
+    android:layout_width="wrap_content"
+    android:src="@drawable/track" />
   <LinearLayout
     android:layout_height="wrap_content"
+    android:layout_marginLeft="8dp"
     android:layout_width="fill_parent"
-    android:orientation="horizontal" >
+    android:orientation="vertical" >
+    <LinearLayout
+      android:layout_height="wrap_content"
+      android:layout_width="fill_parent"
+      android:orientation="horizontal" >
+      <TextView
+        android:id="@+id/list_item_name"
+        android:singleLine="true"
+        style="@style/TextLarge" />
+      <TextView
+        android:id="@+id/list_item_category"
+        android:layout_marginLeft="8dp"
+        android:singleLine="true"
+        style="@style/TextSmall" />
+    </LinearLayout>
+    <LinearLayout
+      android:layout_height="wrap_content"
+      android:layout_width="fill_parent"
+      android:orientation="horizontal" >
+      <TextView
+        android:id="@+id/list_item_total_time"
+        android:layout_marginRight="8dp"
+        style="@style/ListItemStats" />
+      <TextView
+        android:id="@+id/list_item_total_distance"
+        android:layout_marginRight="8dp"
+        style="@style/ListItemStats" />
+      <TextView
+        android:id="@+id/list_item_start_time"
+        style="@style/ListItemStats" />
+    </LinearLayout>
     <TextView
-      android:id="@+id/list_item_name"
-      android:singleLine="true"
-      style="@style/TextLarge.WithIcon" />
-    <TextView
-      android:id="@+id/list_item_category"
-      android:layout_marginLeft="8dp"
-      android:singleLine="true"
+      android:id="@+id/list_item_description"
+      android:singleLine="false"
+      android:textColor="@android:color/secondary_text_dark"
       style="@style/TextSmall" />
   </LinearLayout>
-  <LinearLayout
-    android:layout_height="wrap_content"
-    android:layout_width="fill_parent"
-    android:orientation="horizontal" >
-    <TextView
-      android:id="@+id/list_item_total_time"
-      android:layout_marginRight="8dp"
-      style="@style/ListItemStats" />
-    <TextView
-      android:id="@+id/list_item_total_distance"
-      android:layout_marginRight="8dp"
-      style="@style/ListItemStats" />
-    <TextView
-      android:id="@+id/list_item_start_time"
-      style="@style/ListItemStats" />
-  </LinearLayout>
-  <TextView
-    android:id="@+id/list_item_description"
-    android:singleLine="false"
-    android:textColor="@android:color/secondary_text_dark"
-    style="@style/TextSmall" />
 </LinearLayout>

MyTracks/res/layout/map.xml

@@ -28,7 +28,7 @@ limitations under the License.
     android:layout_width="fill_parent" />
   <ImageButton
     android:background="@drawable/my_location"
-    android:contentDescription="@string/my_location"
+    android:contentDescription="@string/icon_my_location"
     android:id="@+id/map_my_location"
     android:layout_alignParentTop="true"
     android:layout_alignParentRight="true"

MyTracks/res/values/strings.xml

@@ -825,6 +825,24 @@ limitations under the License.
     What are waypoint markers?
   </string>
 
+  <!-- Icon -->
+  <string name="icon_marker"
+    translation_description="The accessibility description for the 'Marker' icon.">
+    Marker
+  </string>
+  <string name="icon_my_location"
+    translation_description="The accessibility description for the 'My Location' icon.">
+    My Location
+  </string>
+  <string name="icon_recording"
+    translation_description="The accessibility description for the 'Recording' icon.">
+    Recording
+  </string>
+  <string name="icon_track"
+    translation_description="The accessibility description for the 'Track' icon.">
+    Track
+  </string>
+
   <!-- Import -->
   <string name="import_error"
     translation_description="When importing all the tracks, a toast message indicating import error
@@ -1119,11 +1137,6 @@ limitations under the License.
   </string>
 
   <!-- My Location -->
-  <string name="my_location"
-    translation_description="The accessibility description for the My Location button on the map
-      view.">
-    My Location
-  </string>
   <string name="my_location_approximate_location"
     translation_description="When displaying the user's current location, a status message
       indicating that GPS is not available and an approximate location is used instead.">
@@ -2127,10 +2140,6 @@ limitations under the License.
     translation_description="In the track detail page, the title when recording.">
     Recording...
   </string> 
-  <string name="track_icon_description"
-    translation_description="The accessibility description for the track icon.">
-    Track
-  </string>
   <string name="track_edit_activity_type"
     translation_description="In the page to edit a track, the label for the text field to edit the
       activity type, including some examples of activity types.">

MyTracks/res/values/styles.xml

@@ -122,11 +122,6 @@ limitations under the License.
     <item name="android:layout_width">wrap_content</item>
     <item name="android:textSize">22sp</item>
   </style>
-  <!-- The style for large size text with an icon on the left -->
-  <style name="TextLarge.WithIcon">
-    <item name="android:drawablePadding">8dp</item>
-    <item name="android:gravity">center_vertical</item>
-  </style>
   <!-- The style for medium size text -->
   <style name="TextMedium">
     <item name="android:layout_height">wrap_content</item>