19 android:layout_alignParentRight="true" |
19 android:layout_alignParentRight="true" |
20 android:layout_alignParentTop="true" |
20 android:layout_alignParentTop="true" |
21 android:layout_marginBottom="10dp" |
21 android:layout_marginBottom="10dp" |
22 android:baselineAligned="false" |
22 android:baselineAligned="false" |
23 android:minHeight="200dp" > |
23 android:minHeight="200dp" > |
24 |
24 |
25 <FrameLayout |
25 <FrameLayout |
26 android:id="@+id/mapFrame" |
26 android:id="@+id/mapFrame" |
27 android:layout_width="0dp" |
27 android:layout_width="0dp" |
28 android:layout_height="wrap_content" |
28 android:layout_height="wrap_content" |
29 android:layout_marginRight="10dp" |
29 android:layout_marginRight="10dp" |
30 android:layout_weight="1" |
30 android:layout_weight="1" |
31 android:background="@drawable/box" > |
31 android:background="@drawable/box" > |
32 |
32 |
33 <!-- |
33 <fragment |
34 <fragment |
|
35 android:id="@+id/mapFragment" |
34 android:id="@+id/mapFragment" |
36 android:layout_width="fill_parent" |
35 android:layout_width="fill_parent" |
37 android:layout_height="fill_parent" |
36 android:layout_height="fill_parent" |
38 class="org.hedgewars.hedgeroid.netplay.MapFragment" |
37 class="org.hedgewars.hedgeroid.netplay.MapFragment" |
39 tools:layout="@layout/fragment_map" /> |
38 tools:layout="@layout/fragment_map" /> |
40 --> |
|
41 </FrameLayout> |
39 </FrameLayout> |
42 |
40 |
43 <FrameLayout |
41 <FrameLayout |
44 android:id="@+id/settingsFrame" |
42 android:id="@+id/settingsFrame" |
45 android:layout_width="0dp" |
43 android:layout_width="0dp" |
46 android:layout_height="wrap_content" |
44 android:layout_height="wrap_content" |
47 android:layout_marginRight="10dp" |
45 android:layout_marginRight="10dp" |
48 android:layout_weight="1" |
46 android:layout_weight="1" |
49 android:background="@drawable/box" > |
47 android:background="@drawable/box" > |
50 |
48 |
51 <!-- |
49 <fragment |
52 <fragment |
|
53 android:id="@+id/settingsFragment" |
50 android:id="@+id/settingsFragment" |
54 android:layout_width="fill_parent" |
51 android:layout_width="fill_parent" |
55 android:layout_height="fill_parent" |
52 android:layout_height="fill_parent" |
56 class="org.hedgewars.hedgeroid.netplay.SettingsFragment" |
53 class="org.hedgewars.hedgeroid.netplay.SettingsFragment" |
57 tools:layout="@layout/fragment_settings" /> |
54 tools:layout="@layout/fragment_settings" /> |
58 --> |
|
59 </FrameLayout> |
55 </FrameLayout> |
60 |
56 |
61 <FrameLayout |
57 <FrameLayout |
62 android:id="@+id/teamsFrame" |
58 android:id="@+id/teamsFrame" |
63 android:layout_width="0dp" |
59 android:layout_width="0dp" |