From 5178ba7287bbe0a2337497787110f0e7d61e28f4 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 6 Dec 2011 15:15:55 +0300
Subject: properly sort feedlist by unread, misc cleanup

---
 res/menu/main_menu.xml    | 17 +++++++++--------
 res/menu/offline_menu.xml |  6 ------
 2 files changed, 9 insertions(+), 14 deletions(-)

(limited to 'res/menu')

diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index 378e0fbd..72f05555 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -4,12 +4,6 @@
 
         <group android:id="@+id/menu_group_feeds" >
 
-            <item
-                android:id="@+id/go_offline"
-                android:icon="@drawable/ic_menu_cloud"
-                android:showAsAction="ifRoom|withText"
-                android:title="@string/go_offline"/>
-
             <item
                 android:id="@+id/back_to_categories"
                 android:icon="@android:drawable/ic_menu_close_clear_cancel"
@@ -25,9 +19,15 @@
             <item
                 android:id="@+id/update_feeds"
                 android:icon="@android:drawable/ic_menu_rotate"
-                android:showAsAction=""
+                android:showAsAction="ifRoom|"
                 android:title="@string/update_feeds"/>
 
+            <item
+                android:id="@+id/go_offline"
+                android:icon="@drawable/ic_menu_cloud"
+                android:showAsAction="ifRoom|withText"
+                android:title="@string/go_offline"/>
+
             <item
                 android:id="@+id/logout"
                 android:icon="@drawable/ic_menu_exit"
@@ -36,7 +36,7 @@
         </group>
 
         <group android:id="@+id/menu_group_headlines" >
-            
+
             <item
                 android:id="@+id/go_offline"
                 android:icon="@drawable/ic_menu_cloud"
@@ -46,6 +46,7 @@
             <item
                 android:id="@+id/headlines_mark_as_read"
                 android:icon="@drawable/ic_menu_tick"
+                android:showAsAction=""
                 android:title="@string/headlines_mark_as_read"/>
 
             <item
diff --git a/res/menu/offline_menu.xml b/res/menu/offline_menu.xml
index 4cb744f3..c4027d6b 100644
--- a/res/menu/offline_menu.xml
+++ b/res/menu/offline_menu.xml
@@ -20,12 +20,6 @@
             android:icon="@android:drawable/ic_menu_agenda"
             android:showAsAction=""
             android:title="@string/menu_all_feeds"/>
-
-        <item
-            android:id="@+id/logout"
-            android:icon="@drawable/ic_menu_exit"
-            android:showAsAction=""
-            android:title="@string/logout"/>
     </group>
 
     <group android:id="@+id/menu_group_headlines" >
-- 
cgit v1.2.3-54-g00ecf