summaryrefslogtreecommitdiff
path: root/org.fox.ttrss/src/main/res/menu
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2014-10-30 15:15:47 +0400
committerAndrew Dolgov <[email protected]>2014-10-30 15:15:47 +0400
commitf62363bc9600aade9154896c3249e80f155d0c20 (patch)
tree467b58faeeb1259afc86c6e5a5a4bbf1978587d1 /org.fox.ttrss/src/main/res/menu
parent469d60d4b17ac33ea7992d5b9e7d26b78be966e3 (diff)
remove splitactionbar stuff from manifest
Diffstat (limited to 'org.fox.ttrss/src/main/res/menu')
-rw-r--r--org.fox.ttrss/src/main/res/menu/article_content_img_context_menu.xml12
-rw-r--r--org.fox.ttrss/src/main/res/menu/article_link_context_menu.xml6
-rw-r--r--org.fox.ttrss/src/main/res/menu/headlines_action_menu.xml8
-rw-r--r--org.fox.ttrss/src/main/res/menu/headlines_context_menu.xml18
-rw-r--r--org.fox.ttrss/src/main/res/menu/main_menu.xml58
-rw-r--r--org.fox.ttrss/src/main/res/menu/offline_menu.xml36
-rw-r--r--org.fox.ttrss/src/main/res/menu/share_menu.xml4
7 files changed, 71 insertions, 71 deletions
diff --git a/org.fox.ttrss/src/main/res/menu/article_content_img_context_menu.xml b/org.fox.ttrss/src/main/res/menu/article_content_img_context_menu.xml
index 691a1401..76b6c8cd 100644
--- a/org.fox.ttrss/src/main/res/menu/article_content_img_context_menu.xml
+++ b/org.fox.ttrss/src/main/res/menu/article_content_img_context_menu.xml
@@ -1,26 +1,26 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ugh="http://schemas.android.com/apk/res-auto" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" >
<item
android:id="@+id/article_img_open"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/article_img_open"/>
<item
android:id="@+id/article_img_copy"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/article_link_copy"/>
<item
android:id="@+id/article_img_share"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/article_img_share"/>
<item
android:id="@+id/article_img_view_caption"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/article_img_view_caption"/>
<!--
<item
android:id="@+id/article_img_save"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="Save image to file"/>
-->
diff --git a/org.fox.ttrss/src/main/res/menu/article_link_context_menu.xml b/org.fox.ttrss/src/main/res/menu/article_link_context_menu.xml
index 8317d5e0..dcef75b6 100644
--- a/org.fox.ttrss/src/main/res/menu/article_link_context_menu.xml
+++ b/org.fox.ttrss/src/main/res/menu/article_link_context_menu.xml
@@ -1,13 +1,13 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ugh="http://schemas.android.com/apk/res-auto">
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/article_link_share"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/share_article"/>
<item
android:id="@+id/article_link_copy"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/article_link_copy"/>
</menu> \ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/menu/headlines_action_menu.xml b/org.fox.ttrss/src/main/res/menu/headlines_action_menu.xml
index 462fac40..c6e519a0 100644
--- a/org.fox.ttrss/src/main/res/menu/headlines_action_menu.xml
+++ b/org.fox.ttrss/src/main/res/menu/headlines_action_menu.xml
@@ -1,21 +1,21 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ugh="http://schemas.android.com/apk/res-auto">
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/selection_toggle_unread"
- ugh:showAsAction="ifRoom"
+ app: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"
- ugh:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:title="@string/selection_toggle_marked"/>
<item
android:id="@+id/selection_toggle_published"
android:icon="@drawable/ic_menu_unpublished_light"
- ugh:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:title="@string/selection_toggle_published"/>
</menu> \ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/menu/headlines_context_menu.xml b/org.fox.ttrss/src/main/res/menu/headlines_context_menu.xml
index de930a23..fafac872 100644
--- a/org.fox.ttrss/src/main/res/menu/headlines_context_menu.xml
+++ b/org.fox.ttrss/src/main/res/menu/headlines_context_menu.xml
@@ -1,41 +1,41 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ugh="http://schemas.android.com/apk/res-auto">
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/selection_toggle_unread"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/context_selection_toggle_unread"/>
<item
android:id="@+id/selection_toggle_marked"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/context_selection_toggle_marked"/>
<item
android:id="@+id/selection_toggle_published"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/context_selection_toggle_published"/>
<group android:id="@+id/menu_group_single_article" >
<item
android:id="@+id/headlines_share_article"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/share_article"/>
<item
android:id="@+id/headlines_article_link_open"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/open_article_in_web_browser"/>
<item
android:id="@+id/headlines_article_link_copy"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/article_link_copy"/>
<item
android:id="@+id/catchup_above"
- ugh:showAsAction=""
+ app: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"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/article_set_note"/>
</group>
diff --git a/org.fox.ttrss/src/main/res/menu/main_menu.xml b/org.fox.ttrss/src/main/res/menu/main_menu.xml
index e4a9776b..81e06712 100644
--- a/org.fox.ttrss/src/main/res/menu/main_menu.xml
+++ b/org.fox.ttrss/src/main/res/menu/main_menu.xml
@@ -1,4 +1,4 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ugh="http://schemas.android.com/apk/res-auto">
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="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"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/back_to_categories"/>
-->
<item
android:id="@+id/subscribe_to_feed"
android:icon="@drawable/ic_new_light"
- ugh:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:title="@string/subscribe_to_feed"/>
<item
android:id="@+id/show_feeds"
android:icon="@drawable/ic_list_light"
- ugh:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:title="@string/menu_all_feeds"/>
<item
android:id="@+id/go_offline"
android:icon="@drawable/ic_cloud_light"
- ugh:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:title="@string/go_offline"/>
<item
android:id="@+id/update_feeds"
android:icon="@drawable/ic_refresh_light"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/update_feeds"/>
<item
android:id="@+id/logout"
- ugh:showAsAction=""
+ app: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"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/update_headlines"/>
<item
android:id="@+id/search"
- ugh:actionViewClass="android.widget.SearchView"
+ app:actionViewClass="android.widget.SearchView"
android:icon="@drawable/ic_search_light"
- ugh:showAsAction="ifRoom|collapseActionView"
+ app:showAsAction="ifRoom|collapseActionView"
android:title="@string/search"/>
<item
android:id="@+id/headlines_mark_as_read"
android:icon="@drawable/ic_accept_light"
- ugh:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:title="@string/headlines_mark_as_read"/>
<item
android:id="@+id/headlines_select"
- ugh:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:icon="@drawable/ic_select_all_light"
android:title="@string/headlines_select"/>
<item
android:id="@+id/headlines_view_mode"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/headlines_view_mode"/>
<item
android:id="@+id/headlines_toggle_sidebar"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/toggle_sidebar"/>
<!--
<item
android:id="@+id/close_feed"
android:icon="@android:drawable/ic_menu_close_clear_cancel"
- ugh:showAsAction=""
+ app: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"
- ugh:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:title="@string/selection_toggle_unread"/>
<item
android:id="@+id/selection_toggle_marked"
android:icon="@drawable/ic_unimportant_light"
- ugh:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:title="@string/selection_toggle_marked"/>
<item
android:id="@+id/selection_toggle_published"
android:icon="@drawable/ic_menu_unpublished_light"
- ugh:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:title="@string/selection_toggle_published"/>
<item
android:id="@+id/selection_select_none"
- ugh:showAsAction=""
+ app: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"
- ugh:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:title="@string/article_toggle_marked"/>
<item
android:id="@+id/toggle_published"
android:icon="@drawable/ic_menu_unpublished_light"
- ugh:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:title="@string/article_toggle_published"/>
<item
android:id="@+id/toggle_attachments"
android:icon="@drawable/ic_menu_attaches_light"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/attachments_prompt"/>
<item
android:id="@+id/share_article"
android:icon="@drawable/ic_share_light"
- ugh:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:title="@string/share_article"/>
<!-- android:actionProviderClass="android.widget.ShareActionProvider" -->
<item
android:id="@+id/set_labels"
- ugh:showAsAction=""
+ app:showAsAction=""
android:icon="@drawable/ic_labels_light"
android:title="@string/article_set_labels"/>
<item
android:id="@+id/article_set_note"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/article_set_note"/>
<item
@@ -138,28 +138,28 @@
<item
android:id="@+id/set_unread"
android:icon="@drawable/ic_read_light"
- ugh:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:title="@string/article_set_unread"/>
</group>
<item
android:id="@+id/donate"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/trial_purchase"/>
</group>
<item
android:id="@+id/preferences"
android:icon="@android:drawable/ic_menu_preferences"
- ugh:showAsAction=""
+ app: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"
- ugh:showAsAction="ifRoom|withText"
+ app:showAsAction="ifRoom|withText"
android:title="@string/login_login"/>
</group>
diff --git a/org.fox.ttrss/src/main/res/menu/offline_menu.xml b/org.fox.ttrss/src/main/res/menu/offline_menu.xml
index a1bbf222..49709f18 100644
--- a/org.fox.ttrss/src/main/res/menu/offline_menu.xml
+++ b/org.fox.ttrss/src/main/res/menu/offline_menu.xml
@@ -1,64 +1,64 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ugh="http://schemas.android.com/apk/res-auto" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="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"
- ugh:showAsAction="ifRoom|withText"
+ app:showAsAction="ifRoom|withText"
android:title="@string/go_online"
android:visible="false"/>
<item
android:id="@+id/show_feeds"
android:icon="@drawable/ic_list_light"
- ugh:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:title="@string/menu_all_feeds"/>
</group>
<group android:id="@+id/menu_group_headlines" >
<item
android:id="@+id/search"
- ugh:actionViewClass="android.widget.SearchView"
+ app:actionViewClass="android.widget.SearchView"
android:icon="@drawable/ic_search_light"
- ugh:showAsAction="ifRoom|collapseActionView"
+ app:showAsAction="ifRoom|collapseActionView"
android:title="@string/search"/>
<item
android:id="@+id/headlines_mark_as_read"
android:icon="@drawable/ic_accept_light"
- ugh:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:title="@string/headlines_mark_as_read"/>
<item
android:id="@+id/headlines_select"
android:icon="@drawable/ic_select_all_light"
- ugh:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:title="@string/headlines_select"/>
<item
android:id="@+id/headlines_view_mode"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/headlines_view_mode"/>
<item
android:id="@+id/headlines_toggle_sidebar"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/toggle_sidebar"/>
</group>
<!--
<group android:id="@+id/menu_group_headlines_selection" >
<item
android:id="@+id/selection_toggle_unread"
- ugh:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:title="@string/selection_toggle_unread"/>
<item
android:id="@+id/selection_toggle_marked"
android:icon="@drawable/ic_unimportant_light"
- ugh:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:title="@string/selection_toggle_marked"/>
<item
android:id="@+id/selection_toggle_published"
android:icon="@drawable/ic_menu_unpublished_light"
- ugh:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:title="@string/selection_toggle_published"/>
<item
android:id="@+id/selection_select_none"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/selection_select_none"/>
</group>
-->
@@ -66,22 +66,22 @@
<item
android:id="@+id/toggle_marked"
android:icon="@drawable/ic_unimportant_light"
- ugh:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:title="@string/article_toggle_marked"/>
<item
android:id="@+id/toggle_published"
android:icon="@drawable/ic_menu_unpublished_light"
- ugh:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:title="@string/article_toggle_published"/>
<item
android:id="@+id/share_article"
android:icon="@drawable/ic_share_light"
- ugh:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:title="@string/share_article"/>
<item
android:id="@+id/set_unread"
android:icon="@drawable/ic_read_light"
- ugh:showAsAction="ifRoom"
+ app:showAsAction="ifRoom"
android:title="@string/article_set_unread"/>
<item
android:id="@+id/catchup_above"
@@ -90,7 +90,7 @@
<item
android:id="@+id/preferences"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/preferences"/>
</menu> \ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/menu/share_menu.xml b/org.fox.ttrss/src/main/res/menu/share_menu.xml
index f2cb8145..abf87ccd 100644
--- a/org.fox.ttrss/src/main/res/menu/share_menu.xml
+++ b/org.fox.ttrss/src/main/res/menu/share_menu.xml
@@ -1,9 +1,9 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:ugh="http://schemas.android.com/apk/res-auto" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" >
<item
android:id="@+id/preferences"
android:icon="@android:drawable/ic_menu_preferences"
- ugh:showAsAction=""
+ app:showAsAction=""
android:title="@string/preferences"/>
</menu> \ No newline at end of file