Merge branch 'protected/feeds-model' into 'master'

open drawer onBackPressed() instead of quitting if there's a feed open and...

See merge request tt-rss/tt-rss-android!36

1 files changed, 5 insertions, 9 deletions

diff --git a/org.fox.ttrss/src/main/res/menu/context_feed.xml b/org.fox.ttrss/src/main/res/menu/context_feed.xml
index 0b0cdc3e..53b610f7 100644
--- a/org.fox.ttrss/src/main/res/menu/context_feed.xml
+++ b/org.fox.ttrss/src/main/res/menu/context_feed.xml
@@ -1,23 +1,19 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
     <item
-        android:id="@+id/browse_headlines"
+        android:id="@+id/feed_browse_headlines"
         android:title="@string/category_browse_headlines"/>
-    
-    <!-- <item
-        android:id="@+id/browse_articles"
-        android:title="@string/category_browse_articles"/> -->
-    
+
      <item
-        android:id="@+id/browse_feeds"
+        android:id="@+id/feed_browse_feeds"
         android:title="@string/category_browse_feeds"/>
     
     <item
-        android:id="@+id/catchup_feed"
+        android:id="@+id/feed_catchup"
         android:title="@string/catchup"/>
 
     <item
-     	android:id="@+id/unsubscribe_feed"
+     	android:id="@+id/feed_unsubscribe"
         android:title="@string/unsubscribe"/>
     
 </menu>
\ No newline at end of file