Change track icon based on activity type.

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>