From 1469ff7b8f0a01e14a8a80a741c2ec1df84ca645 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 24 Nov 2011 19:11:10 +0300
Subject: reorganize actionbar

---
 res/menu/main_menu.xml | 25 +++++++++++++------------
 res/values/strings.xml |  2 +-
 2 files changed, 14 insertions(+), 13 deletions(-)

(limited to 'res')

diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index ab463bef..97e713e4 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -9,7 +9,7 @@
 
   
     <item android:id="@+id/show_feeds"
-    	  android:visible="false"    	  
+    	  android:enabled="false"    	  
           android:icon="@android:drawable/ic_menu_rotate"
           android:title="@string/menu_all_feeds" 
           android:showAsAction=""/>
@@ -21,23 +21,24 @@
           android:showAsAction="ifRoom|withText"/>
         
           
-     <item android:id="@+id/update"
-     	  android:visible="false"
+     <item android:id="@+id/update_feeds"
+     	  android:enabled="false"
           android:icon="@android:drawable/ic_menu_rotate"
-          android:title="@string/update" 
-          android:showAsAction="ifRoom|withText"/>
+          android:title="@string/update_feeds" 
+          android:showAsAction=""/>
 
-     <item android:id="@+id/share"
-     	  android:enabled="false"
-          android:icon="@android:drawable/ic_menu_share"
-          android:title="@string/share_article" 
-          android:showAsAction="ifRoom"/>
-          
      <item android:id="@+id/preferences"
           android:icon="@android:drawable/ic_menu_preferences"
           android:title="@string/preferences" 
-          android:showAsAction="ifRoom|withText"/>
+          android:showAsAction=""/>
           
+
+     <item android:id="@+id/share_article"
+     	  android:visible="false"
+          android:icon="@android:drawable/ic_menu_share"
+          android:title="@string/share_article" 
+          android:showAsAction="ifRoom"/>
+                    
      <item android:id="@+id/logout"
     	  android:visible="false"
           android:title="@string/logout" 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 97578e8f..6441033b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -28,7 +28,7 @@
     <string name="loading_message">Loading, please wait...</string>
     <string name="menu_unread_feeds">Show unread feeds</string>
     <string name="menu_all_feeds">Show all feeds</string>
-    <string name="update">Update</string>
+    <string name="update_feeds">Refresh feeds</string>
     <string name="close_article">Close article</string>
     <string name="share_article">Share article</string>
 </resources>
-- 
cgit v1.2.3