--- a/project_files/Android-build/SDL-android-project/res/layout/activity_lobby.xml Thu Jul 19 22:55:36 2012 +0200
+++ b/project_files/Android-build/SDL-android-project/res/layout/activity_lobby.xml Sat Jul 21 14:56:52 2012 +0200
@@ -4,65 +4,33 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<include layout="@layout/background"/>
-
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
+ <TabHost
+ android:id="@android:id/tabhost"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:padding="5dp" >
-
- <FrameLayout
- android:layout_width="fill_parent"
- android:layout_height="0dp"
- android:layout_marginBottom="10dp"
- android:layout_weight="0.3"
- android:background="@drawable/box" >
-
- <fragment
- android:id="@+id/roomListFragment"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- class="org.hedgewars.hedgeroid.netplay.RoomlistFragment"
- tools:layout="@layout/lobby_rooms_fragment" />
- </FrameLayout>
-
- <LinearLayout
- android:layout_width="fill_parent"
- android:layout_height="0dp"
- android:layout_weight="0.7"
- android:baselineAligned="false"
- android:orientation="horizontal" >
-
- <FrameLayout
- android:layout_width="0dp"
- android:layout_height="fill_parent"
- android:layout_marginRight="10dp"
- android:layout_weight="0.7"
- android:background="@drawable/box" >
-
- <fragment
- android:id="@+id/chatFragment"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- class="org.hedgewars.hedgeroid.netplay.LobbyChatFragment"
- tools:layout="@layout/lobby_chat_fragment" />
- </FrameLayout>
-
- <FrameLayout
- android:layout_width="0dp"
- android:layout_height="fill_parent"
- android:layout_weight="0.3"
- android:background="@drawable/box" >
-
- <fragment
- android:id="@+id/playerListFragment"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- class="org.hedgewars.hedgeroid.netplay.PlayerlistFragment"
- tools:layout="@layout/lobby_players_fragment" />
- </FrameLayout>
- </LinearLayout>
-
- </LinearLayout>
+ android:layout_height="match_parent">
+
+ <LinearLayout
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <TabWidget
+ android:id="@android:id/tabs"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"/>
+
+ <FrameLayout
+ android:id="@android:id/tabcontent"
+ android:layout_width="0dp"
+ android:layout_height="0dp"/>
+
+ <android.support.v4.view.ViewPager
+ android:id="@+id/pager"
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"/>
+
+ </LinearLayout>
+</TabHost>
</FrameLayout>
\ No newline at end of file