Merge heads

MyTracks/res/layout/choose_activity_type.xml

@@ -18,7 +18,6 @@ limitations under the License.
   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" />
+  android:padding="4dp"
+  android:stretchMode="spacingWidth"
+  android:verticalSpacing="4dp" />

MyTracks/res/layout/track_edit.xml

@@ -41,20 +41,20 @@ limitations under the License.
         android:layout_width="match_parent"
         android:orientation="horizontal" >
         <AutoCompleteTextView
+          android:gravity="bottom"
           android:hint="@string/track_edit_activity_type_hint"
           android:id="@+id/track_edit_activity_type"
           android:imeOptions="actionNext"
           android:layout_gravity="bottom"
+          android:layout_height="fill_parent"
           android:layout_weight="1"
           android:layout_width="0dp"
           style="@style/EditCategory" />
-        <ImageButton
-          android:contentDescription="@string/activity_type_walking"
+        <Spinner          
           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" />
+          android:layout_width="wrap_content" />
       </LinearLayout>
       <TextView
         android:text="@string/generic_description"