In track edit, move the activity icon next to the activity lable so that

the icon shows on Gingerbread phones.

MyTracks/res/values/strings.xml

@@ -960,9 +960,9 @@ limitations under the License.
     Marker type: %1$s
   </string>
   <string name="marker_edit_marker_type"
-    translation_description="In the marker edit page, the label for the marker type, including some
-      examples.">
-    Marker type (e.g. building, waterfall...)
+    translation_description="In the marker edit page, the label for the marker type, including an
+      example.">
+    Marker type (e.g. waterfall)
   </string>
   <string name="marker_edit_marker_type_hint"
     translation_description="In the marker edit page, the hint in the marker type text field when it
@@ -2209,8 +2209,8 @@ limitations under the License.
   </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.">
-    Activity type (e.g. hiking, cycling...)
+      activity type, including an example.">
+    Activity type (e.g. hiking)
   </string>
   <string name="track_edit_activity_type_hint"
     translation_description="In the page to edit a track, the hint in the 'Activity type' text field

MyTracks/res/values/styles.xml

@@ -44,14 +44,8 @@ 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 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">
+  <!-- The style for the editing category -->
+  <style name="EditCategory" parent="@style/TextMedium">
     <item name="android:layout_width">fill_parent</item>
     <item name="android:selectAllOnFocus">true</item>
     <item name="android:singleLine">true</item>
@@ -68,6 +62,14 @@ limitations under the License.
   <style name="EditLabel" parent="@style/TextMedium">
     <item name="android:layout_width">fill_parent</item>
   </style>
+  <!-- The style for the edit label with icon -->
+  <style name="EditLabel.WithIcon" parent="@style/TextMedium.WithIcon">
+    <item name="android:layout_width">fill_parent</item>
+  </style>
+  <!-- The style for the edit label with icon and with padding top -->
+  <style name="EditLabel.WithIcon.WithPaddingTop">
+    <item name="android:paddingTop">16dp</item>
+  </style>
   <!-- The style for the edit lable with padding top -->
   <style name="EditLabel.WithPaddingTop">
     <item name="android:paddingTop">16dp</item>
@@ -153,7 +155,6 @@ limitations under the License.
   <style name="TextLarge">
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">wrap_content</item>
-    <item name="android:textColor">?android:textColorPrimary</item>
     <item name="android:textSize">22sp</item>
   </style>
   <!-- The style for large size text with top margin -->
@@ -164,7 +165,6 @@ limitations under the License.
   <style name="TextMedium">
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">wrap_content</item>
-    <item name="android:textColor">?android:textColorPrimary</item>
     <item name="android:textSize">18sp</item>
   </style>
   <!-- The style for medium size text with an icon on the left -->
@@ -176,7 +176,6 @@ limitations under the License.
   <style name="TextSmall">
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">wrap_content</item>
-    <item name="android:textColor">?android:textColorSecondary</item>
     <item name="android:textSize">14sp</item>
   </style>
   <!-- Theme selector -->