summaryrefslogtreecommitdiff
path: root/res/layout/main.xml
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2011-11-24 16:04:58 +0300
committerAndrew Dolgov <[email protected]>2011-11-24 16:04:58 +0300
commit7ad712cb413824b1caae4327e8cc2f691e29d888 (patch)
treeecd27c5fe7dec0500237795e1a0cab9fe9e29c63 /res/layout/main.xml
parentfb86971ca88b47d24f83de1f2d495ba8b1815a44 (diff)
handle login/logout and session errors in child fragments
Diffstat (limited to 'res/layout/main.xml')
-rw-r--r--res/layout/main.xml14
1 files changed, 6 insertions, 8 deletions
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 97a9e9c8..9b327d8a 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,12 +1,10 @@
-<ViewFlipper xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent" android:id="@+id/main_flipper">
- <FrameLayout android:layout_gravity="center_vertical" android:layout_height="match_parent" android:layout_width="match_parent" android:id="@+id/sync_splash">
- <LinearLayout android:layout_width="match_parent" android:gravity="center" android:layout_height="match_parent" android:id="@+id/linearLayout1">
- <ProgressBar android:layout_height="wrap_content" android:layout_width="wrap_content" style="?android:attr/progressBarStyleLarge" android:id="@+id/loading_progress"></ProgressBar>
- <TextView android:id="@+id/loading_message" android:text="@string/loading_message" android:textAppearance="?android:attr/textAppearanceLarge" android:layout_height="wrap_content" android:layout_width="wrap_content"></TextView>
- </LinearLayout>
- </FrameLayout>
+ <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" android:id="@+id/loading_container">
+ <ProgressBar android:id="@+id/loading_progress" android:layout_height="wrap_content" android:layout_width="wrap_content" style="?android:attr/progressBarStyleLarge"></ProgressBar>
+ <TextView android:textAppearance="?android:attr/textAppearanceLarge" android:text="@string/loading_message" android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/loading_message"></TextView>
+ </LinearLayout>
<LinearLayout android:layout_height="fill_parent" android:orientation="horizontal" android:id="@+id/main" android:layout_width="fill_parent">
<FrameLayout android:layout_height="match_parent" android:layout_width="300dp" android:layout_weight="0" android:id="@+id/feeds_fragment"></FrameLayout>
<FrameLayout android:layout_height="match_parent" android:layout_width="0dp" android:layout_weight="0.5" android:id="@+id/headlines_fragment"></FrameLayout>
@@ -14,4 +12,4 @@
</LinearLayout>
-</ViewFlipper> \ No newline at end of file
+</FrameLayout> \ No newline at end of file