implement special options menu for selected headlines

2 files changed, 35 insertions, 14 deletions

diff --git a/res/menu/headlines_menu.xml b/res/menu/headlines_menu.xml
index ac614810..32ecae81 100644
--- a/res/menu/headlines_menu.xml
+++ b/res/menu/headlines_menu.xml
@@ -4,18 +4,18 @@
         android:id="@+id/selection_toggle_unread"
         android:icon="@android:drawable/ic_menu_recent_history"
         android:showAsAction=""
-        android:title="@string/selection_toggle_unread"/>
+        android:title="@string/context_selection_toggle_unread"/>
 
     <item
         android:id="@+id/selection_toggle_marked"
         android:icon="@android:drawable/star_off"
         android:showAsAction=""
-        android:title="@string/selection_toggle_marked"/>
+        android:title="@string/context_selection_toggle_marked"/>
 
     <item
         android:id="@+id/selection_toggle_published"
         android:icon="@drawable/ic_menu_rss"
         android:showAsAction=""
-        android:title="@string/selection_toggle_published"/>
+        android:title="@string/context_selection_toggle_published"/>
 
 </menu>
\ No newline at end of file
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index 584b896b..719f004c 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -1,11 +1,5 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <item
-        android:id="@+id/preferences"
-        android:icon="@android:drawable/ic_menu_preferences"
-        android:showAsAction=""
-        android:title="@string/preferences"/>
-
     <group android:id="@+id/menu_group_logged_in" >
 
         <group android:id="@+id/menu_group_feeds" >
@@ -27,6 +21,11 @@
                 android:icon="@android:drawable/ic_menu_rotate"
                 android:showAsAction=""
                 android:title="@string/update_feeds"/>
+
+            <item
+                android:id="@+id/logout"
+                android:showAsAction=""
+                android:title="@string/logout"/>
         </group>
 
         <group android:id="@+id/menu_group_headlines" >
@@ -54,6 +53,27 @@
                 android:title="@string/headlines_select"/>
         </group>
 
+        <group android:id="@+id/menu_group_headlines_selection" >
+
+            <item
+                android:id="@+id/selection_mark_as_read"
+                android:icon="@android:drawable/ic_menu_close_clear_cancel"
+                android:showAsAction=""
+                android:title="@string/selection_mark_as_read"/>
+
+            <item
+                android:id="@+id/selection_toggle_marked"
+                android:icon="@android:drawable/star_off"
+                android:showAsAction=""
+                android:title="@string/selection_toggle_marked"/>
+
+            <item
+                android:id="@+id/selection_toggle_published"
+                android:icon="@drawable/ic_menu_rss"
+                android:showAsAction=""
+                android:title="@string/selection_toggle_published"/>
+        </group>
+
         <group android:id="@+id/menu_group_article" >
 
             <item
@@ -86,13 +106,14 @@
                 android:showAsAction="ifRoom|withText"
                 android:title="@string/close_article"/>
         </group>
-
-        <item
-            android:id="@+id/logout"
-            android:showAsAction=""
-            android:title="@string/logout"/>
     </group>
 
+    <item
+        android:id="@+id/preferences"
+        android:icon="@android:drawable/ic_menu_preferences"
+        android:showAsAction=""
+        android:title="@string/preferences"/>
+
     <group android:id="@+id/menu_group_logged_out" >
 
         <item