diff options
author | Andrew Dolgov <[email protected]> | 2014-10-15 13:29:20 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2014-10-15 13:29:20 +0400 |
commit | 4eef7998285ebd2e1c9baace3c027023e2907cba (patch) | |
tree | aa3f86f4b0591949984f6634fc6d632f83396131 /res/menu | |
parent | 6663e58d16cdc9133f5ebf36e971fbceaeaebdef (diff) |
remove actionbarsherlock, switch to appcompat stuff
Diffstat (limited to 'res/menu')
-rw-r--r-- | res/menu/article_content_img_context_menu.xml | 12 | ||||
-rw-r--r-- | res/menu/article_link_context_menu.xml | 6 | ||||
-rw-r--r-- | res/menu/headlines_action_menu.xml | 8 | ||||
-rw-r--r-- | res/menu/headlines_context_menu.xml | 18 | ||||
-rw-r--r-- | res/menu/main_menu.xml | 58 | ||||
-rw-r--r-- | res/menu/offline_menu.xml | 36 | ||||
-rw-r--r-- | res/menu/share_menu.xml | 4 |
7 files changed, 71 insertions, 71 deletions
diff --git a/res/menu/article_content_img_context_menu.xml b/res/menu/article_content_img_context_menu.xml index 128a21df..691a1401 100644 --- a/res/menu/article_content_img_context_menu.xml +++ b/res/menu/article_content_img_context_menu.xml @@ -1,26 +1,26 @@ -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ugh="http://schemas.android.com/apk/res-auto" > <item android:id="@+id/article_img_open" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/article_img_open"/> <item android:id="@+id/article_img_copy" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/article_link_copy"/> <item android:id="@+id/article_img_share" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/article_img_share"/> <item android:id="@+id/article_img_view_caption" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/article_img_view_caption"/> <!-- <item android:id="@+id/article_img_save" - android:showAsAction="" + ugh:showAsAction="" android:title="Save image to file"/> --> diff --git a/res/menu/article_link_context_menu.xml b/res/menu/article_link_context_menu.xml index 21fa3f76..8317d5e0 100644 --- a/res/menu/article_link_context_menu.xml +++ b/res/menu/article_link_context_menu.xml @@ -1,13 +1,13 @@ -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ugh="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/article_link_share" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/share_article"/> <item android:id="@+id/article_link_copy" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/article_link_copy"/> </menu>
\ No newline at end of file diff --git a/res/menu/headlines_action_menu.xml b/res/menu/headlines_action_menu.xml index f6e97d93..462fac40 100644 --- a/res/menu/headlines_action_menu.xml +++ b/res/menu/headlines_action_menu.xml @@ -1,21 +1,21 @@ -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ugh="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/selection_toggle_unread" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:icon="@drawable/ic_unread_light" android:title="@string/selection_toggle_unread"/> <item android:id="@+id/selection_toggle_marked" android:icon="@drawable/ic_unimportant_light" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:title="@string/selection_toggle_marked"/> <item android:id="@+id/selection_toggle_published" android:icon="@drawable/ic_menu_unpublished_light" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:title="@string/selection_toggle_published"/> </menu>
\ No newline at end of file diff --git a/res/menu/headlines_context_menu.xml b/res/menu/headlines_context_menu.xml index d50fac1d..de930a23 100644 --- a/res/menu/headlines_context_menu.xml +++ b/res/menu/headlines_context_menu.xml @@ -1,41 +1,41 @@ -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ugh="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/selection_toggle_unread" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/context_selection_toggle_unread"/> <item android:id="@+id/selection_toggle_marked" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/context_selection_toggle_marked"/> <item android:id="@+id/selection_toggle_published" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/context_selection_toggle_published"/> <group android:id="@+id/menu_group_single_article" > <item android:id="@+id/headlines_share_article" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/share_article"/> <item android:id="@+id/headlines_article_link_open" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/open_article_in_web_browser"/> <item android:id="@+id/headlines_article_link_copy" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/article_link_copy"/> <item android:id="@+id/catchup_above" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/article_mark_read_above"/> <item android:id="@+id/set_labels" android:title="@string/article_set_labels"/> <item android:id="@+id/article_set_note" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/article_set_note"/> </group> diff --git a/res/menu/main_menu.xml b/res/menu/main_menu.xml index b6708983..e4a9776b 100644 --- a/res/menu/main_menu.xml +++ b/res/menu/main_menu.xml @@ -1,4 +1,4 @@ -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ugh="http://schemas.android.com/apk/res-auto"> <group android:id="@+id/menu_group_logged_in" > <group android:id="@+id/menu_group_feeds" > @@ -7,74 +7,74 @@ <item android:id="@+id/back_to_categories" android:icon="@android:drawable/ic_menu_close_clear_cancel" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/back_to_categories"/> --> <item android:id="@+id/subscribe_to_feed" android:icon="@drawable/ic_new_light" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:title="@string/subscribe_to_feed"/> <item android:id="@+id/show_feeds" android:icon="@drawable/ic_list_light" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:title="@string/menu_all_feeds"/> <item android:id="@+id/go_offline" android:icon="@drawable/ic_cloud_light" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:title="@string/go_offline"/> <item android:id="@+id/update_feeds" android:icon="@drawable/ic_refresh_light" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/update_feeds"/> <item android:id="@+id/logout" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/logout"/> </group> <group android:id="@+id/menu_group_headlines" > <item android:id="@+id/update_headlines" android:icon="@drawable/ic_refresh_light" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/update_headlines"/> <item android:id="@+id/search" - android:actionViewClass="android.widget.SearchView" + ugh:actionViewClass="android.widget.SearchView" android:icon="@drawable/ic_search_light" - android:showAsAction="ifRoom|collapseActionView" + ugh:showAsAction="ifRoom|collapseActionView" android:title="@string/search"/> <item android:id="@+id/headlines_mark_as_read" android:icon="@drawable/ic_accept_light" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:title="@string/headlines_mark_as_read"/> <item android:id="@+id/headlines_select" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:icon="@drawable/ic_select_all_light" android:title="@string/headlines_select"/> <item android:id="@+id/headlines_view_mode" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/headlines_view_mode"/> <item android:id="@+id/headlines_toggle_sidebar" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/toggle_sidebar"/> <!-- <item android:id="@+id/close_feed" android:icon="@android:drawable/ic_menu_close_clear_cancel" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/close_feed"/> --> @@ -82,53 +82,53 @@ <!-- <group android:id="@+id/menu_group_headlines_selection" > <item android:id="@+id/selection_toggle_unread" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:title="@string/selection_toggle_unread"/> <item android:id="@+id/selection_toggle_marked" android:icon="@drawable/ic_unimportant_light" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:title="@string/selection_toggle_marked"/> <item android:id="@+id/selection_toggle_published" android:icon="@drawable/ic_menu_unpublished_light" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:title="@string/selection_toggle_published"/> <item android:id="@+id/selection_select_none" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/selection_select_none"/> </group> --> <group android:id="@+id/menu_group_article" > <item android:id="@+id/toggle_marked" android:icon="@drawable/ic_unimportant_light" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:title="@string/article_toggle_marked"/> <item android:id="@+id/toggle_published" android:icon="@drawable/ic_menu_unpublished_light" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:title="@string/article_toggle_published"/> <item android:id="@+id/toggle_attachments" android:icon="@drawable/ic_menu_attaches_light" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/attachments_prompt"/> <item android:id="@+id/share_article" android:icon="@drawable/ic_share_light" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:title="@string/share_article"/> <!-- android:actionProviderClass="android.widget.ShareActionProvider" --> <item android:id="@+id/set_labels" - android:showAsAction="" + ugh:showAsAction="" android:icon="@drawable/ic_labels_light" android:title="@string/article_set_labels"/> <item android:id="@+id/article_set_note" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/article_set_note"/> <item @@ -138,28 +138,28 @@ <item android:id="@+id/set_unread" android:icon="@drawable/ic_read_light" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:title="@string/article_set_unread"/> </group> <item android:id="@+id/donate" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/trial_purchase"/> </group> <item android:id="@+id/preferences" android:icon="@android:drawable/ic_menu_preferences" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/preferences"/> <group android:id="@+id/menu_group_logged_out" > <item android:id="@+id/login" android:icon="@android:drawable/ic_menu_rotate" - android:showAsAction="ifRoom|withText" + ugh:showAsAction="ifRoom|withText" android:title="@string/login_login"/> </group> diff --git a/res/menu/offline_menu.xml b/res/menu/offline_menu.xml index 90e2e4aa..a1bbf222 100644 --- a/res/menu/offline_menu.xml +++ b/res/menu/offline_menu.xml @@ -1,64 +1,64 @@ -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ugh="http://schemas.android.com/apk/res-auto" > <group android:id="@+id/menu_group_feeds" > <item android:id="@+id/go_online" android:icon="@drawable/ic_cloud_light" - android:showAsAction="ifRoom|withText" + ugh:showAsAction="ifRoom|withText" android:title="@string/go_online" android:visible="false"/> <item android:id="@+id/show_feeds" android:icon="@drawable/ic_list_light" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:title="@string/menu_all_feeds"/> </group> <group android:id="@+id/menu_group_headlines" > <item android:id="@+id/search" - android:actionViewClass="android.widget.SearchView" + ugh:actionViewClass="android.widget.SearchView" android:icon="@drawable/ic_search_light" - android:showAsAction="ifRoom|collapseActionView" + ugh:showAsAction="ifRoom|collapseActionView" android:title="@string/search"/> <item android:id="@+id/headlines_mark_as_read" android:icon="@drawable/ic_accept_light" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:title="@string/headlines_mark_as_read"/> <item android:id="@+id/headlines_select" android:icon="@drawable/ic_select_all_light" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:title="@string/headlines_select"/> <item android:id="@+id/headlines_view_mode" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/headlines_view_mode"/> <item android:id="@+id/headlines_toggle_sidebar" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/toggle_sidebar"/> </group> <!-- <group android:id="@+id/menu_group_headlines_selection" > <item android:id="@+id/selection_toggle_unread" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:title="@string/selection_toggle_unread"/> <item android:id="@+id/selection_toggle_marked" android:icon="@drawable/ic_unimportant_light" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:title="@string/selection_toggle_marked"/> <item android:id="@+id/selection_toggle_published" android:icon="@drawable/ic_menu_unpublished_light" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:title="@string/selection_toggle_published"/> <item android:id="@+id/selection_select_none" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/selection_select_none"/> </group> --> @@ -66,22 +66,22 @@ <item android:id="@+id/toggle_marked" android:icon="@drawable/ic_unimportant_light" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:title="@string/article_toggle_marked"/> <item android:id="@+id/toggle_published" android:icon="@drawable/ic_menu_unpublished_light" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:title="@string/article_toggle_published"/> <item android:id="@+id/share_article" android:icon="@drawable/ic_share_light" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:title="@string/share_article"/> <item android:id="@+id/set_unread" android:icon="@drawable/ic_read_light" - android:showAsAction="ifRoom" + ugh:showAsAction="ifRoom" android:title="@string/article_set_unread"/> <item android:id="@+id/catchup_above" @@ -90,7 +90,7 @@ <item android:id="@+id/preferences" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/preferences"/> </menu>
\ No newline at end of file diff --git a/res/menu/share_menu.xml b/res/menu/share_menu.xml index 7eb79800..f2cb8145 100644 --- a/res/menu/share_menu.xml +++ b/res/menu/share_menu.xml @@ -1,9 +1,9 @@ -<menu xmlns:android="http://schemas.android.com/apk/res/android" > +<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ugh="http://schemas.android.com/apk/res-auto" > <item android:id="@+id/preferences" android:icon="@android:drawable/ic_menu_preferences" - android:showAsAction="" + ugh:showAsAction="" android:title="@string/preferences"/> </menu>
\ No newline at end of file |