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_weight="1" |
30 android:layout_weight="1" |
30 android:layout_marginRight="10dp" |
|
31 android:background="@drawable/box" > |
31 android:background="@drawable/box" > |
32 |
32 |
33 <!-- <fragment |
33 <!-- |
|
34 <fragment |
34 android:id="@+id/mapFragment" |
35 android:id="@+id/mapFragment" |
|
36 android:layout_width="fill_parent" |
|
37 android:layout_height="fill_parent" |
35 class="org.hedgewars.hedgeroid.netplay.MapFragment" |
38 class="org.hedgewars.hedgeroid.netplay.MapFragment" |
36 tools:layout="@layout/fragment_map" /> --> |
39 tools:layout="@layout/fragment_map" /> |
|
40 --> |
37 </FrameLayout> |
41 </FrameLayout> |
38 |
42 |
39 <FrameLayout |
43 <FrameLayout |
40 android:id="@+id/settingsFrame" |
44 android:id="@+id/settingsFrame" |
41 android:layout_width="0dp" |
45 android:layout_width="0dp" |
42 android:layout_height="wrap_content" |
46 android:layout_height="wrap_content" |
43 android:layout_marginRight="10dp" |
47 android:layout_marginRight="10dp" |
44 android:layout_weight="1" |
48 android:layout_weight="1" |
45 android:background="@drawable/box" > |
49 android:background="@drawable/box" > |
46 |
50 |
47 <!-- <fragment |
51 <!-- |
|
52 <fragment |
48 android:id="@+id/settingsFragment" |
53 android:id="@+id/settingsFragment" |
|
54 android:layout_width="fill_parent" |
|
55 android:layout_height="fill_parent" |
49 class="org.hedgewars.hedgeroid.netplay.SettingsFragment" |
56 class="org.hedgewars.hedgeroid.netplay.SettingsFragment" |
50 tools:layout="@layout/fragment_settings" /> --> |
57 tools:layout="@layout/fragment_settings" /> |
|
58 --> |
51 </FrameLayout> |
59 </FrameLayout> |
52 |
60 |
53 <FrameLayout |
61 <FrameLayout |
54 android:id="@+id/teamsFrame" |
62 android:id="@+id/teamsFrame" |
55 android:layout_width="0dp" |
63 android:layout_width="0dp" |
56 android:layout_height="fill_parent" |
64 android:layout_height="fill_parent" |
57 android:layout_weight="1" |
65 android:layout_weight="1" |
58 android:background="@drawable/box" > |
66 android:background="@drawable/box" > |
59 |
67 |
60 <!-- <fragment |
68 <fragment |
61 android:id="@+id/teamsFragment" |
69 android:id="@+id/teamsFragment" |
62 class="org.hedgewars.hedgeroid.netplay.TeamsFragment" |
70 android:layout_width="fill_parent" |
63 tools:layout="@layout/fragment_teamlist" /> --> |
71 android:layout_height="fill_parent" |
64 |
72 class="org.hedgewars.hedgeroid.netplay.TeamlistFragment" |
|
73 tools:layout="@layout/fragment_teamlist" /> |
65 </FrameLayout> |
74 </FrameLayout> |
66 </LinearLayout> |
75 </LinearLayout> |
67 |
76 |
68 <FrameLayout |
77 <FrameLayout |
69 android:id="@+id/playerFrame" |
78 android:id="@+id/playerFrame" |
72 android:layout_alignParentBottom="true" |
81 android:layout_alignParentBottom="true" |
73 android:layout_alignParentRight="true" |
82 android:layout_alignParentRight="true" |
74 android:layout_below="@id/upperFrame" |
83 android:layout_below="@id/upperFrame" |
75 android:background="@drawable/box" > |
84 android:background="@drawable/box" > |
76 |
85 |
77 <!-- <fragment |
86 <fragment |
78 android:id="@+id/playerListFragment" |
87 android:id="@+id/playerListFragment" |
79 android:layout_width="fill_parent" |
88 android:layout_width="fill_parent" |
80 android:layout_height="fill_parent" |
89 android:layout_height="fill_parent" |
81 class="org.hedgewars.hedgeroid.netplay.PlayerlistFragment" |
90 class="org.hedgewars.hedgeroid.netplay.RoomPlayerlistFragment" |
82 tools:layout="@layout/lobby_players_fragment" /> --> |
91 tools:layout="@layout/fragment_playerlist" /> |
83 </FrameLayout> |
92 </FrameLayout> |
84 |
93 |
85 <FrameLayout |
94 <FrameLayout |
86 android:layout_width="0dp" |
95 android:layout_width="0dp" |
87 android:layout_height="fill_parent" |
96 android:layout_height="fill_parent" |