- use a dialog to insert markers with an option to open full insert screen

- remember the last chosen marker type
- auto increment the default marker name
- fix IME option when toggling between marker type
- add more spacing between items in the editor
- rename WaypointType to WAYPOINT and STATISTICS
- rename to ListItemUtils
- remove unused appwidget_text color

MyTracks/res/layout/marker_add.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2012 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+  style="@style/ScrollView" >
+  <RelativeLayout
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:padding="8dp" >
+    <RadioGroup
+      android:id="@+id/marker_add_type"
+      android:layout_alignParentLeft="true"
+      android:layout_alignParentTop="true"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content" >
+      <RadioButton
+        android:id="@+id/marker_add_statistics"
+        android:text="@string/marker_statistics"
+        style="@style/TextMedium" />
+      <RadioButton
+        android:id="@+id/marker_add_waypoint"
+        android:text="@string/marker_waypoint"
+        style="@style/TextMedium" />
+    </RadioGroup>
+    <Button
+      android:id="@+id/marker_add_more_options"
+      android:layout_alignParentBottom="true"
+      android:layout_alignParentRight="true"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:text="@string/generic_more_options" />
+  </RelativeLayout>
+</ScrollView>

MyTracks/res/layout/marker_detail.xml

@@ -30,10 +30,10 @@ limitations under the License.
       android:layout_width="fill_parent"
       android:orientation="vertical" >
       <TextView
-        android:id="@+id/marker_detail_marker_type"
+        android:id="@+id/marker_detail_waypoint_marker_type"
         style="@style/TextLarge" />
       <TextView
-        android:id="@+id/marker_detail_description"
+        android:id="@+id/marker_detail_waypoint_description"
         style="@style/TextLarge" />
     </LinearLayout>
     <TableLayout

MyTracks/res/layout/marker_edit.xml

@@ -30,48 +30,62 @@ limitations under the License.
         android:layout_width="fill_parent"
         android:orientation="vertical" >
         <TextView
-          android:text="@string/marker_edit_type"
-          style="@style/TextMedium" />
+          android:text="@string/marker_type"
+          style="@style/EditLabel" />
         <RadioGroup
           android:id="@+id/marker_edit_type"
           android:layout_height="wrap_content"
           android:layout_width="wrap_content" >
           <RadioButton
-            android:id="@+id/marker_edit_type_statistics"
-            android:text="@string/marker_edit_type_statistics"
+            android:id="@+id/marker_edit_statistics"
+            android:text="@string/marker_statistics"
             style="@style/TextMedium" />
           <RadioButton
-            android:id="@+id/marker_edit_type_waypoint"
-            android:text="@string/marker_edit_type_waypoint"
+            android:id="@+id/marker_edit_waypoint"
+            android:text="@string/marker_waypoint"
             style="@style/TextMedium" />
         </RadioGroup>
       </LinearLayout>
       <TextView
         android:text="@string/generic_name"
-        style="@style/TextMedium" />
-      <EditText
-        android:hint="@string/generic_name"
-        android:id="@+id/marker_edit_name"
-        style="@style/EditName" />
+        style="@style/EditLabel" />
+      <LinearLayout
+        android:id="@+id/marker_edit_statistics_section"
+        android:layout_height="wrap_content"
+        android:layout_width="fill_parent"
+        android:orientation="vertical" >
+        <EditText
+          android:drawableLeft="@drawable/yellow_pushpin"
+          android:hint="@string/generic_name"
+          android:id="@+id/marker_edit_statistics_name"
+          android:imeOptions="actionDone"
+          style="@style/EditName" />
+      </LinearLayout>
       <LinearLayout
         android:id="@+id/marker_edit_waypoint_section"
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
         android:orientation="vertical" >
+        <EditText
+          android:drawableLeft="@drawable/blue_pushpin"
+          android:hint="@string/generic_name"
+          android:id="@+id/marker_edit_waypoint_name"
+          android:imeOptions="actionNext"
+          style="@style/EditName" />
         <TextView
-          android:text="@string/marker_edit_marker_type"
-          style="@style/TextMedium" />
+          android:text="@string/marker_edit_waypoint_marker_type"
+          style="@style/EditLabel.WithPaddingTop" />
         <AutoCompleteTextView
-          android:hint="@string/marker_edit_marker_type_hint"
-          android:id="@+id/marker_edit_marker_type"
+          android:hint="@string/marker_edit_waypoint_marker_type_hint"
+          android:id="@+id/marker_edit_waypoint_marker_type"
           android:imeOptions="actionNext"
           style="@style/EditCategory" />
         <TextView
           android:text="@string/generic_description"
-          style="@style/TextMedium" />
+          style="@style/EditLabel.WithPaddingTop" />
         <EditText
           android:hint="@string/generic_description"
-          android:id="@+id/marker_edit_description"
+          android:id="@+id/marker_edit_waypoint_description"
           android:imeOptions="actionDone"
           style="@style/EditDescription" />
       </LinearLayout>

MyTracks/res/layout/track_edit.xml

@@ -26,7 +26,7 @@ limitations under the License.
       android:padding="8dp" >
       <TextView
         android:text="@string/generic_name"
-        style="@style/TextMedium" />
+        style="@style/EditLabel" />
       <EditText
         android:drawableLeft="@drawable/track"
         android:hint="@string/generic_name"
@@ -35,7 +35,7 @@ limitations under the License.
         style="@style/EditName" />
       <TextView
         android:text="@string/track_edit_activity_type"
-        style="@style/TextMedium" />
+        style="@style/EditLabel.WithPaddingTop" />
       <AutoCompleteTextView
         android:hint="@string/track_edit_activity_type_hint"
         android:id="@+id/track_edit_activity_type"
@@ -43,7 +43,7 @@ limitations under the License.
         style="@style/EditCategory" />
       <TextView
         android:text="@string/generic_description"
-        style="@style/TextMedium" />
+        style="@style/EditLabel.WithPaddingTop" />
       <EditText
         android:hint="@string/generic_description"
         android:id="@+id/track_edit_description"