Change track icon based on activity type.

MyTracks/res/layout/list_item.xml

@@ -25,8 +25,7 @@ limitations under the License.
     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" />
+    android:layout_width="wrap_content" />
   <LinearLayout
     android:layout_height="wrap_content"
     android:layout_marginLeft="8dp"

MyTracks/res/layout/marker_edit.xml

@@ -37,7 +37,7 @@ limitations under the License.
           android:hint="@string/generic_name"
           android:id="@+id/marker_edit_statistics_name"
           android:imeOptions="actionDone"
-          style="@style/EditName" />
+          style="@style/EditNameMarker" />
       </LinearLayout>
       <LinearLayout
         android:id="@+id/marker_edit_waypoint_section"
@@ -49,7 +49,7 @@ limitations under the License.
           android:hint="@string/generic_name"
           android:id="@+id/marker_edit_waypoint_name"
           android:imeOptions="actionNext"
-          style="@style/EditName" />
+          style="@style/EditNameMarker" />
         <TextView
           android:text="@string/marker_edit_marker_type"
           style="@style/EditLabel.WithPaddingTop" />
@@ -57,7 +57,7 @@ limitations under the License.
           android:hint="@string/marker_edit_marker_type_hint"
           android:id="@+id/marker_edit_waypoint_marker_type"
           android:imeOptions="actionNext"
-          style="@style/EditCategory" />
+          style="@style/EditCategoryMarker" />
         <TextView
           android:text="@string/generic_description"
           style="@style/EditLabel.WithPaddingTop" />

MyTracks/res/layout/track_edit.xml

@@ -28,11 +28,10 @@ limitations under the License.
         android:text="@string/generic_name"
         style="@style/EditLabel" />
       <EditText
-        android:drawableLeft="@drawable/track"
         android:hint="@string/generic_name"
         android:id="@+id/track_edit_name"
         android:imeOptions="actionNext"
-        style="@style/EditName" />
+        style="@style/EditNameTrack" />
       <TextView
         android:text="@string/track_edit_activity_type"
         style="@style/EditLabel.WithPaddingTop" />
@@ -40,7 +39,7 @@ limitations under the License.
         android:hint="@string/track_edit_activity_type_hint"
         android:id="@+id/track_edit_activity_type"
         android:imeOptions="actionNext"
-        style="@style/EditCategory" />
+        style="@style/EditCategoryTrack" />
       <TextView
         android:text="@string/generic_description"
         style="@style/EditLabel.WithPaddingTop" />

MyTracks/res/values/arrays_do_not_translate.xml

@@ -27,6 +27,7 @@ limitations under the License.
     <item>@string/activity_type_cycling</item>
     <item>@string/activity_type_dirt_bike</item>
     <item>@string/activity_type_donkey_back_riding</item>
+    <item>@string/activity_type_driving</item>
     <item>@string/activity_type_driving_bus</item>
     <item>@string/activity_type_driving_car</item>
     <item>@string/activity_type_ferry</item>

MyTracks/res/values/strings.xml

@@ -93,6 +93,11 @@ limitations under the License.
       completion suggestion for donkey back riding.">
     donkey back riding
   </string>
+  <string name="activity_type_driving"
+    translation_description="When entering an 'Activity type', in the auto-complete text box, the
+      completion suggestion for driving.">
+    driving
+  </string>
   <string name="activity_type_driving_bus"
     translation_description="When entering an 'Activity type', in the auto-complete text box, the
       completion suggestion for driving bus.">

MyTracks/res/values/styles.xml

@@ -43,8 +43,14 @@ limitations under the License.
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">wrap_content</item>
   </style>
-  <!-- The style for the edit category -->
-  <style name="EditCategory" parent="@style/TextMedium">
+  <!-- The style for the editing marker category -->
+  <style name="EditCategoryMarker" parent="@style/TextMedium">
+    <item name="android:layout_width">fill_parent</item>
+    <item name="android:selectAllOnFocus">true</item>
+    <item name="android:singleLine">true</item>
+  </style>
+  <!-- The style for the editing track category -->
+  <style name="EditCategoryTrack" parent="@style/TextMedium.WithIcon">
     <item name="android:layout_width">fill_parent</item>
     <item name="android:selectAllOnFocus">true</item>
     <item name="android:singleLine">true</item>
@@ -63,8 +69,15 @@ limitations under the License.
   <style name="EditLabel.WithPaddingTop">
     <item name="android:paddingTop">16dp</item>
   </style>
-  <!-- The style for the edit name -->
-  <style name="EditName" parent="@style/TextMedium.WithIcon">
+  <!-- The style for editing marker name -->
+  <style name="EditNameMarker" parent="@style/TextMedium.WithIcon">
+    <item name="android:inputType">textAutoCorrect|textCapWords</item>
+    <item name="android:layout_width">fill_parent</item>
+    <item name="android:selectAllOnFocus">true</item>
+    <item name="android:singleLine">true</item>
+  </style>
+  <!-- The style for editing track name -->
+  <style name="EditNameTrack" parent="@style/TextMedium">
     <item name="android:inputType">textAutoCorrect|textCapWords</item>
     <item name="android:layout_width">fill_parent</item>
     <item name="android:selectAllOnFocus">true</item>