Add a dialog for user to choose the activty type.

By apoorvn.

MyTracks/res/layout/choose_activity_type.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2013 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.
+-->
+<GridView xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_height="wrap_content"
+  android:layout_width="match_parent"
+  android:numColumns="4"
+  android:paddingBottom="20dp"
+  android:paddingTop="20dp"
+  android:stretchMode="columnWidth"
+  android:verticalSpacing="20dp" />

MyTracks/res/layout/track_edit.xml

@@ -35,12 +35,27 @@ limitations under the License.
       <TextView
         android:id="@+id/track_edit_activity_type_label"
         android:text="@string/track_edit_activity_type"
-        style="@style/EditLabel.WithIcon.WithPaddingTop" />
-      <AutoCompleteTextView
-        android:hint="@string/track_edit_activity_type_hint"
-        android:id="@+id/track_edit_activity_type"
-        android:imeOptions="actionNext"
-        style="@style/EditCategory" />
+        style="@style/EditLabel.WithPaddingTop" />
+      <LinearLayout
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:orientation="horizontal" >
+        <AutoCompleteTextView
+          android:hint="@string/track_edit_activity_type_hint"
+          android:id="@+id/track_edit_activity_type"
+          android:imeOptions="actionNext"
+          android:layout_gravity="bottom"
+          android:layout_weight="1"
+          android:layout_width="0dp"
+          style="@style/EditCategory" />
+        <ImageButton
+          android:contentDescription="@string/activity_type_walking"
+          android:id="@+id/track_edit_activity_type_icon"
+          android:layout_gravity="bottom"
+          android:layout_height="wrap_content"
+          android:layout_width="wrap_content"
+          android:src="@drawable/track_walk" />
+      </LinearLayout>
       <TextView
         android:text="@string/generic_description"
         style="@style/EditLabel.WithPaddingTop" />

MyTracks/res/values/styles.xml

@@ -68,10 +68,6 @@ limitations under the License.
   <style name="EditLabel.WithIcon" parent="@style/TextMedium.WithIcon">
     <item name="android:layout_width">match_parent</item>
   </style>
-  <!-- edit label with icon, width padding top -->
-  <style name="EditLabel.WithIcon.WithPaddingTop">
-    <item name="android:paddingTop">16dp</item>
-  </style>
   <!-- edit label with padding top -->
   <style name="EditLabel.WithPaddingTop">
     <item name="android:paddingTop">16dp</item>