From 3cc0cb84104bb3d69ab276fe81a1ce42ec31cc4e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Thu, 24 Nov 2011 17:57:44 +0300
Subject: various layout tweaks fix logout action

---
 res/menu/login_menu.xml | 15 ---------------
 res/menu/main_menu.xml  | 19 ++++++++++++++-----
 2 files changed, 14 insertions(+), 20 deletions(-)
 delete mode 100644 res/menu/login_menu.xml

(limited to 'res/menu')

diff --git a/res/menu/login_menu.xml b/res/menu/login_menu.xml
deleted file mode 100644
index 0c244247..00000000
--- a/res/menu/login_menu.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-    <menu xmlns:android="http://schemas.android.com/apk/res/android">
-     <item android:id="@+id/preferences"
-          android:icon="@android:drawable/ic_menu_preferences"
-          android:title="@string/preferences" 
-          android:showAsAction="ifRoom|withText"
-          />
-                    
-     <item android:id="@+id/login"
-          android:icon="@android:drawable/ic_menu_rotate"
-          android:title="@string/login_login" 
-          android:showAsAction="ifRoom|withText"
-          />    
-              
-    </menu>
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index a4dcb9f3..57b6a65d 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -7,17 +7,20 @@
           android:title="@string/login" 
           android:showAsAction="ifRoom|withText"/>
 
-    <item android:id="@+id/logout"
-    	  android:visible="false"
-          android:title="@string/logout" 
-          android:showAsAction=""/>
-    
+  
     <item android:id="@+id/show_feeds"
     	  android:visible="false"    	  
           android:icon="@android:drawable/ic_menu_rotate"
           android:title="@string/menu_all_feeds" 
           android:showAsAction=""/>
           
+     <item android:id="@+id/close_article"
+     	  android:visible="false"
+          android:icon="@android:drawable/ic_menu_close_clear_cancel"
+          android:title="@string/close_article" 
+          android:showAsAction="ifRoom|withText"/>
+        
+          
      <item android:id="@+id/update"
      	  android:visible="false"
           android:icon="@android:drawable/ic_menu_rotate"
@@ -28,4 +31,10 @@
           android:icon="@android:drawable/ic_menu_preferences"
           android:title="@string/preferences" 
           android:showAsAction="ifRoom|withText"/>
+          
+     <item android:id="@+id/logout"
+    	  android:visible="false"
+          android:title="@string/logout" 
+          android:showAsAction=""/>
+    
     </menu>
-- 
cgit v1.2.3-54-g00ecf