From d9d778c56503cf65dbbd13079890412621d551c8 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 22 Nov 2011 15:13:02 +0300
Subject: remove offline sync stuff

---
 res/layout-land/main.xml | 42 ------------------------------------------
 res/layout/main.xml      | 23 +++++++++++------------
 res/menu/main_menu.xml   |  6 ------
 3 files changed, 11 insertions(+), 60 deletions(-)
 delete mode 100644 res/layout-land/main.xml

(limited to 'res')

diff --git a/res/layout-land/main.xml b/res/layout-land/main.xml
deleted file mode 100644
index 717231cf..00000000
--- a/res/layout-land/main.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<ViewFlipper 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:id="@+id/sync_splash" android:layout_width="match_parent" android:layout_height="match_parent">
-        <LinearLayout android:gravity="center" android:id="@+id/linearLayout1" android:layout_width="match_parent" android:layout_height="match_parent">
-            <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:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/loading_message" android:text="@string/loading_message"></TextView>
-        </LinearLayout>
-    </FrameLayout>
-    
-    <LinearLayout android:layout_width="fill_parent" android:layout_height="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="horizontal" android:id="@+id/main">
-    
-    	<LinearLayout android:layout_weight="1.5" android:layout_height="match_parent" android:id="@+id/linearLayout4" android:layout_width="match_parent">
-
-            <LinearLayout android:layout_height="match_parent" android:id="@+id/feeds_container"
-                            	android:layout_weight="1" 
-             
-            android:layout_width="match_parent">
-            </LinearLayout>
-			
-                <ImageView
-    				xmlns:android="http://schemas.android.com/apk/res/android"
-    				android:background="?feedlistDivider" 
-    				android:paddingLeft="2dip" android:paddingRight="2dip"
-    				android:layout_width="wrap_content" android:layout_height="match_parent"></ImageView>
-                
-            </LinearLayout>
-    	<LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="0.5" android:id="@+id/headlines_wrapper">
-    		<LinearLayout android:layout_width="match_parent" android:layout_weight="1" android:id="@+id/headlines_container" android:layout_height="match_parent">
-    		</LinearLayout>
-    		
-    		<ImageView android:paddingRight="2dip" android:layout_height="match_parent" android:background="?feedlistDivider" android:layout_width="wrap_content" android:paddingLeft="2dip"></ImageView>
-    		
-    		<LinearLayout android:layout_weight="1" android:visibility="gone" android:layout_width="match_parent" android:id="@+id/article_container" android:layout_height="match_parent"></LinearLayout>
-    	</LinearLayout>
-            
-        
-    </LinearLayout>
-    
-    
-</ViewFlipper>
\ No newline at end of file
diff --git a/res/layout/main.xml b/res/layout/main.xml
index bed3e86b..65a5be25 100644
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,21 +1,20 @@
 <ViewFlipper 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:id="@+id/sync_splash" android:layout_height="match_parent" android:layout_gravity="center_vertical" android:layout_width="match_parent">
-        <LinearLayout android:gravity="center" android:layout_width="match_parent" android:id="@+id/linearLayout1" android:layout_height="match_parent">
-            <ProgressBar android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/loading_progress" style="?android:attr/progressBarStyleLarge"></ProgressBar>
-            <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/loading_message" android:textAppearance="?android:attr/textAppearanceLarge" android:id="@+id/loading_message"></TextView>
+    <FrameLayout android:layout_gravity="center_vertical" android:id="@+id/sync_splash" android:layout_width="match_parent" android:layout_height="match_parent">
+        <LinearLayout android:layout_width="match_parent" android:id="@+id/linearLayout1" android:gravity="center" android:layout_height="match_parent">
+            <ProgressBar android:id="@+id/loading_progress" android:layout_height="wrap_content" android:layout_width="wrap_content" style="?android:attr/progressBarStyleLarge"></ProgressBar>
+            <TextView android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/loading_message" android:textAppearance="?android:attr/textAppearanceLarge" android:text="@string/loading_message"></TextView>
         </LinearLayout>
     </FrameLayout>
-    <LinearLayout android:layout_height="fill_parent" android:id="@+id/main" android:layout_width="fill_parent" android:orientation="horizontal">
-        <LinearLayout android:layout_weight="1.5" android:id="@+id/linearLayout4" android:layout_width="match_parent" android:layout_height="match_parent">
-            <LinearLayout android:layout_weight="1" android:id="@+id/feeds_container" android:layout_width="match_parent" android:layout_height="match_parent"></LinearLayout>
-            <ImageView android:background="?feedlistDivider" android:paddingLeft="2dip" android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="match_parent" android:paddingRight="2dip"></ImageView>
+    <LinearLayout android:id="@+id/main" android:layout_width="fill_parent" android:layout_height="fill_parent" android:orientation="horizontal">
+        <LinearLayout android:layout_height="match_parent" android:layout_width="match_parent" android:id="@+id/linearLayout4" android:layout_weight="1.5">
+            <LinearLayout android:layout_height="match_parent" android:layout_width="match_parent" android:id="@+id/feeds_container" android:layout_weight="1"></LinearLayout>
+            <ImageView android:paddingLeft="2dip" android:layout_height="match_parent" android:layout_width="wrap_content" android:layout_weight="1" android:background="?feedlistDivider" android:paddingRight="2dip"></ImageView>
         </LinearLayout>
-        <LinearLayout android:layout_weight="0.5" android:id="@+id/headlines_wrapper" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical">
-            <LinearLayout android:layout_weight="1" android:id="@+id/headlines_container" android:layout_width="match_parent" android:layout_height="match_parent"></LinearLayout>
-            <!--  <ImageView android:background="?feedlistDivider" android:paddingLeft="2dip" android:layout_weight="1" android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingRight="2dip"></ImageView> -->
-            <LinearLayout android:visibility="gone" android:layout_weight="1" android:id="@+id/article_container" android:layout_width="match_parent" android:layout_height="match_parent"></LinearLayout>
+        <LinearLayout android:layout_height="match_parent" android:layout_width="match_parent" android:id="@+id/headlines_wrapper" android:layout_weight="0.5" android:orientation="vertical">
+            <LinearLayout android:layout_height="match_parent" android:layout_width="match_parent" android:id="@+id/headlines_container" android:layout_weight="1"></LinearLayout>
+            <LinearLayout android:visibility="gone" android:layout_height="match_parent" android:layout_width="match_parent" android:id="@+id/article_container" android:layout_weight="1"></LinearLayout>
         </LinearLayout>
     </LinearLayout>
     
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index ebd8fe44..42ec20e9 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -4,10 +4,4 @@
           android:icon="@android:drawable/ic_menu_preferences"
           android:title="@string/preferences" 
           android:showAsAction="ifRoom|withText"/>
-
-     <item android:id="@+id/sync_status"
-          android:title="@string/offline"          
-          android:icon="@android:drawable/presence_offline"
-          android:showAsAction="ifRoom|withText"/>    
-              
     </menu>
-- 
cgit v1.2.3-54-g00ecf