summaryrefslogtreecommitdiff
path: root/res/menu
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2011-11-29 20:00:37 +0300
committerAndrew Dolgov <[email protected]>2011-11-29 20:00:37 +0300
commit574aaebb900b8420b3adcf05a7bc971c002ed327 (patch)
tree3469e51b9ec9da7fbf75c6e2464edb26992c5639 /res/menu
parenta36e2e8d0c9496ecefb5cc1ed525932c7a5f77d1 (diff)
properly use context menu for operations on selected headlines
Diffstat (limited to 'res/menu')
-rw-r--r--res/menu/headlines_menu.xml21
-rw-r--r--res/menu/main_menu.xml29
2 files changed, 29 insertions, 21 deletions
diff --git a/res/menu/headlines_menu.xml b/res/menu/headlines_menu.xml
new file mode 100644
index 00000000..ac614810
--- /dev/null
+++ b/res/menu/headlines_menu.xml
@@ -0,0 +1,21 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item
+ android:id="@+id/selection_toggle_unread"
+ android:icon="@android:drawable/ic_menu_recent_history"
+ android:showAsAction=""
+ android:title="@string/selection_toggle_unread"/>
+
+ <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"/>
+
+</menu> \ No newline at end of file
diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml
index a23bcb61..2d2e2998 100644
--- a/res/menu/main_menu.xml
+++ b/res/menu/main_menu.xml
@@ -38,11 +38,18 @@
android:title="@string/load_more_articles"/>
<item
+ android:id="@+id/catchup_and_load"
+ android:icon="@android:drawable/ic_menu_rotate"
+ android:showAsAction="ifRoom|withText"
+ android:title="@string/catchup_and_load"/>
+
+ <item
android:id="@+id/show_all_articles"
android:icon="@android:drawable/ic_menu_agenda"
android:showAsAction=""
android:title="@string/show_all_articles"/>
+
<item
android:id="@+id/headlines_select_all"
android:title="@string/headlines_select_all"/>
@@ -50,30 +57,10 @@
<item
android:id="@+id/headlines_select_unread"
android:title="@string/headlines_select_unread"/>
-
+
<item
android:id="@+id/headlines_select_none"
android:title="@string/headlines_select_none"/>
-
- <item
- android:id="@+id/selection_toggle_unread"
- android:icon="@android:drawable/ic_menu_recent_history"
- android:showAsAction=""
- android:title="@string/selection_toggle_unread"/>
-
- <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" >