1
0
Fork 0

Merged versions

This commit is contained in:
Carlos Galindo 2015-04-07 09:28:31 +02:00
parent d423aedd33
commit 553da8d43a
16 changed files with 132 additions and 129 deletions

View file

@ -48,6 +48,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:id="@+id/classSpinner"
tools:listitem="@android:layout/simple_spinner_dropdown_item"
android:spinnerMode="dropdown" />
<Spinner
@ -55,7 +56,8 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:id="@+id/raceSpinner"
android:spinnerMode="dialog" />
tools:listitem="@android:layout/simple_spinner_dropdown_item"
android:spinnerMode="dropdown" />
</LinearLayout>
<GridLayout
@ -143,4 +145,24 @@
android:hint="@string/CAR"/>
</GridLayout>
<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_below="@+id/thirdLayout"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true">
<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/new_attack"
android:id="@+id/new_attack_button" />
<ListView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/listView" />
</LinearLayout>
</RelativeLayout>