From 7393ab7631bfe138263ea8ffe2be4e012908d6c9 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 9 Sep 2011 13:23:56 +0400
Subject: various activity lifecycle-related fixes

---
 res/layout/feeds_fragment.xml | 5 +++++
 res/menu/main_menu.xml        | 6 +++---
 res/values/strings.xml        | 3 +++
 3 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'res')

diff --git a/res/layout/feeds_fragment.xml b/res/layout/feeds_fragment.xml
index 90bf1907..9d2db1cc 100644
--- a/res/layout/feeds_fragment.xml
+++ b/res/layout/feeds_fragment.xml
@@ -10,4 +10,9 @@
     <ProgressBar android:layout_height="wrap_content"
         android:layout_width="wrap_content" android:visibility="invisible"
         android:layout_gravity="center" android:id="@+id/loading_progress"/>
+     <TextView android:id="@+id/no_unread_feeds"
+     	android:visibility="invisible"    	
+    	android:layout_gravity="center" 
+    	android:textAppearance="?android:attr/textAppearanceLarge" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/no_unread_feeds"></TextView>
+        
     </FrameLayout>
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index f935a5e2..ebd8fe44 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -5,9 +5,9 @@
           android:title="@string/preferences" 
           android:showAsAction="ifRoom|withText"/>
 
-     <!--  <item android:id="@+id/logout"
-          android:title="@string/logout"          
+     <item android:id="@+id/sync_status"
+          android:title="@string/offline"          
           android:icon="@android:drawable/presence_offline"
-          android:showAsAction="ifRoom|withText"/> -->    
+          android:showAsAction="ifRoom|withText"/>    
               
     </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e4ac1e8a..8dc43dcb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -24,4 +24,7 @@
     <string name="login_wrong_password">Login failed: username or password incorrect.</string>
     <string name="login_success">Logged in.</string>
     <string name="no_unread_feeds">No unread feeds.</string>
+    <string name="offline">Offline</string>
+    <string name="online">Online</string>
+    <string name="synchronizing">Synchronizing...</string>
 </resources>
-- 
cgit v1.2.3-54-g00ecf