From 31ff0490790e37aa6d1bf796abc5b542628703f3 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Tue, 19 May 2015 16:11:31 +0200
Subject: Added filters in option menu; removed option menu from filteractivity

---
 app/src/main/res/menu/menu_filters.xml       | 7 -------
 app/src/main/res/menu/menu_unified_inbox.xml | 3 +++
 2 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 app/src/main/res/menu/menu_filters.xml

(limited to 'app/src/main/res/menu')

diff --git a/app/src/main/res/menu/menu_filters.xml b/app/src/main/res/menu/menu_filters.xml
deleted file mode 100644
index 0f6a87f..0000000
--- a/app/src/main/res/menu/menu_filters.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="org.rssin.android.FiltersActivity">
-    <item android:id="@+id/action_settings" android:title="@string/action_settings"
-        android:orderInCategory="100" app:showAsAction="never" />
-</menu>
diff --git a/app/src/main/res/menu/menu_unified_inbox.xml b/app/src/main/res/menu/menu_unified_inbox.xml
index 2c72c6d..2800171 100644
--- a/app/src/main/res/menu/menu_unified_inbox.xml
+++ b/app/src/main/res/menu/menu_unified_inbox.xml
@@ -1,6 +1,9 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools" tools:context=".UnifiedInboxActivity">
+
     <item android:id="@+id/action_settings" android:title="@string/action_settings"
         android:orderInCategory="100" app:showAsAction="never" />
+    <item android:id="@+id/action_filters" android:title="@string/action_filters"
+        android:orderInCategory="100" app:showAsAction="never" />
 </menu>
-- 
cgit v1.2.3